Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
O
OpenXG UE
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Michael Black
OpenXG UE
Commits
ed982f95
Commit
ed982f95
authored
Dec 12, 2018
by
Laurent
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix issue 379
parent
fc8e5ddc
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
52 additions
and
55 deletions
+52
-55
cmake_targets/CMakeLists.txt
cmake_targets/CMakeLists.txt
+52
-55
No files found.
cmake_targets/CMakeLists.txt
View file @
ed982f95
...
@@ -260,17 +260,17 @@ add_boolean_option(ENABLE_ITTI True "ITTI is internal messaging, should remain e
...
@@ -260,17 +260,17 @@ add_boolean_option(ENABLE_ITTI True "ITTI is internal messaging, should remain e
set
(
OCP_ITTI
${
OPENAIR_DIR
}
/common/utils/ocp_itti
)
set
(
OCP_ITTI
${
OPENAIR_DIR
}
/common/utils/ocp_itti
)
if
(
${
ENABLE_ITTI
}
)
if
(
${
ENABLE_ITTI
}
)
add_library
(
ITTI
add_library
(
ITTI
# add .h files if depend on (this one is generated)
${
OCP_ITTI
}
/intertask_interface.cpp
${
OCP_ITTI
}
/intertask_interface.cpp
${
OPENAIR_DIR
}
/common/utils/backtrace.c
${
OPENAIR_DIR
}
/common/utils/backtrace.c
${
OPENAIR_DIR
}
/common/utils/memory_pools.c
${
OPENAIR_DIR
}
/common/utils/memory_pools.c
)
)
add_dependencies
(
ITTI rrc_flag
)
set
(
ITTI_LIB ITTI
)
set
(
ITTI_LIB ITTI
)
set
(
GTPU_need_ITTI
${
OPENAIR3_DIR
}
/GTPV1-U/gtpv1u_eNB.c
)
set
(
GTPU_need_ITTI
${
OPENAIR3_DIR
}
/GTPV1-U/gtpv1u_eNB.c
)
endif
(
${
ENABLE_ITTI
}
)
endif
(
${
ENABLE_ITTI
}
)
#############################
#############################
# ASN.1 grammar C code generation & depend
a
ncies
# ASN.1 grammar C code generation & depend
e
ncies
################################
################################
# A difficulty: asn1c generates C code of a un-predictable list of files
# A difficulty: asn1c generates C code of a un-predictable list of files
# so, generate the c from asn1c once at cmake run time
# so, generate the c from asn1c once at cmake run time
...
@@ -278,8 +278,6 @@ endif (${ENABLE_ITTI})
...
@@ -278,8 +278,6 @@ endif (${ENABLE_ITTI})
# (so creating new asn.1 objects instead of modifying the object attributes)
# (so creating new asn.1 objects instead of modifying the object attributes)
# New C code source file, cmake must be re-run (instead of re-running make only)
# New C code source file, cmake must be re-run (instead of re-running make only)
#############
#############
# set(asn1c_call "${OPENAIR_CMAKE}/tools/generate_asn1")
# set(fix_asn1c_call "${OPENAIR_CMAKE}/tools/fix_asn1")
set
(
asn1_generated_dir
${
OPENAIR_BIN_DIR
}
)
set
(
asn1_generated_dir
${
OPENAIR_BIN_DIR
}
)
set
(
protoc_call
"
${
OPENAIR_CMAKE
}
/tools/generate_protobuf"
)
set
(
protoc_call
"
${
OPENAIR_CMAKE
}
/tools/generate_protobuf"
)
...
@@ -317,32 +315,27 @@ elseif (${RRC_ASN1_VERSION} STREQUAL "Rel15")
...
@@ -317,32 +315,27 @@ elseif (${RRC_ASN1_VERSION} STREQUAL "Rel15")
endif
(
${
RRC_ASN1_VERSION
}
STREQUAL
"Rel8"
)
endif
(
${
RRC_ASN1_VERSION
}
STREQUAL
"Rel8"
)
add_definitions
(
-DLTE_RRC_VERSION=
${
LTE_RRC_VERSION
}
)
add_definitions
(
-DLTE_RRC_VERSION=
${
LTE_RRC_VERSION
}
)
set
(
RRC_FULL_DIR
${
asn1_generated_dir
}
/RRC_
${
RRC_ASN1_VERSION
}
)
set
(
RRC_FULL_DIR
${
asn1_generated_dir
}
/RRC_
${
RRC_ASN1_VERSION
}
)
message
(
"calling ASN1C_PREFIX=LTE_ asn1c -pdu=all -fcompound-names -gen-PER -no-gen-OER -no-gen-example -D
${
RRC_FULL_DIR
}
${
RRC_GRAMMAR
}
"
)
execute_process
(
COMMAND mkdir -p
${
RRC_FULL_DIR
}
# Warning: if you modify ASN.1 source file to generate new C files, cmake should be re-run instead of make
COMMAND env
"ASN1C_PREFIX=LTE_"
asn1c -pdu=all -fcompound-names -gen-PER -no-gen-OER -no-gen-example -D
${
RRC_FULL_DIR
}
${
RRC_GRAMMAR
}
execute_process
(
COMMAND
${
OPENAIR_CMAKE
}
/tools/make_asn1c_includes.sh
"
${
RRC_FULL_DIR
}
"
"
${
RRC_GRAMMAR
}
"
"LTE_"
RESULT_VARIABLE ret
)
RESULT_VARIABLE ret
)
if
(
NOT
${
ret
}
STREQUAL 0
)
if
(
NOT
${
ret
}
STREQUAL 0
)
message
(
FATAL_ERROR
"
${
ret
}
: error"
)
message
(
FATAL_ERROR
"
${
ret
}
: error"
)
endif
(
NOT
${
ret
}
STREQUAL 0
)
endif
(
NOT
${
ret
}
STREQUAL 0
)
file
(
GLOB rrc_source
${
RRC_FULL_DIR
}
/*.c
)
file
(
GLOB rrc_source
${
RRC_FULL_DIR
}
/*.c
)
file
(
GLOB rrc_h
${
RRC_FULL_DIR
}
/*.h
)
add_custom_target
(
set
(
rrc_h
${
rrc_h
}
${
RRC_FULL_DIR
}
/asn_constant.h
)
rrc_flag ALL
${
OPENAIR_CMAKE
}
/tools/make_asn1c_includes.sh
"
${
RRC_FULL_DIR
}
"
"
${
RRC_GRAMMAR
}
"
"LTE_"
DEPENDS
${
RRC_GRAMMAR
}
)
set_source_files_properties
(
${
rrc_source
}
PROPERTIES COMPILE_FLAGS -w
)
# suppress warnings from generated code
set_source_files_properties
(
${
rrc_source
}
PROPERTIES COMPILE_FLAGS -w
)
# suppress warnings from generated code
add_library
(
RRC_LIB
${
rrc_
h
}
${
rrc_
source
}
add_library
(
RRC_LIB
${
rrc_source
}
${
OPENAIR2_DIR
}
/RRC/LTE/MESSAGES/asn1_msg.c
${
OPENAIR2_DIR
}
/RRC/LTE/MESSAGES/asn1_msg.c
${
OPENAIR2_DIR
}
/RRC/LTE/MESSAGES/asn1_msg_NB_IoT.c
)
${
OPENAIR2_DIR
}
/RRC/LTE/MESSAGES/asn1_msg_NB_IoT.c
)
add_dependencies
(
RRC_LIB rrc_flag
)
include_directories
(
"
${
RRC_FULL_DIR
}
"
)
include_directories
(
"
${
RRC_FULL_DIR
}
"
)
# add the command to generate the source code
# Warning: if you modify ASN.1 source file to generate new C files, cmake should be re-run instead of make
add_custom_command
(
OUTPUT
${
RRC_FULL_DIR
}
/asn_constant.h
COMMAND mkdir -p
${
RRC_FULL_DIR
}
COMMAND env
"ASN1C_PREFIX=LTE_"
asn1c -pdu=all -fcompound-names -gen-PER -no-gen-OER -no-gen-example -D
${
RRC_FULL_DIR
}
${
RRC_GRAMMAR
}
DEPENDS
${
RRC_GRAMMAR
}
)
# S1AP
# S1AP
# Same limitation as described in RRC: unknown generated file list
# Same limitation as described in RRC: unknown generated file list
# so we generate it at cmake time
# so we generate it at cmake time
...
@@ -378,28 +371,26 @@ endif(${S1AP_RELEASE} STREQUAL "R8")
...
@@ -378,28 +371,26 @@ endif(${S1AP_RELEASE} STREQUAL "R8")
add_definitions
(
-DS1AP_VERSION=
${
S1AP_VERSION
}
)
add_definitions
(
-DS1AP_VERSION=
${
S1AP_VERSION
}
)
set
(
S1AP_ASN_DIR
${
S1AP_DIR
}
/MESSAGES/ASN1/
${
S1AP_RELEASE
}
)
set
(
S1AP_ASN_DIR
${
S1AP_DIR
}
/MESSAGES/ASN1/
${
S1AP_RELEASE
}
)
set
(
S1AP_C_DIR
${
asn1_generated_dir
}
/S1AP_
${
S1AP_RELEASE
}
)
set
(
S1AP_C_DIR
${
asn1_generated_dir
}
/S1AP_
${
S1AP_RELEASE
}
)
message
(
"calling ASN1C_PREFIX=S1AP_ asn1c -pdu=all -fcompound-names -fno-include-deps -gen-PER -no-gen-OER -no-gen-example -D
${
S1AP_C_DIR
}
${
S1AP_ASN_DIR
}
/
${
S1AP_ASN_FILES
}
"
)
execute_process
(
COMMAND mkdir -p
${
S1AP_C_DIR
}
# Warning: if you modify ASN.1 source file to generate new C files, cmake should be re-run instead of make
COMMAND env
"ASN1C_PREFIX=S1AP_"
asn1c -pdu=all -fcompound-names -fno-include-deps -gen-PER -no-gen-OER -no-gen-example -D
${
S1AP_C_DIR
}
${
S1AP_ASN_DIR
}
/
${
S1AP_ASN_FILES
}
execute_process
(
COMMAND
${
OPENAIR_CMAKE
}
/tools/make_asn1c_includes.sh
"
${
S1AP_C_DIR
}
"
"
${
S1AP_ASN_DIR
}
/
${
S1AP_ASN_FILES
}
"
"S1AP_"
-fno-include-deps
RESULT_VARIABLE ret
)
RESULT_VARIABLE ret
)
if
(
NOT
${
ret
}
STREQUAL 0
)
if
(
NOT
${
ret
}
STREQUAL 0
)
message
(
FATAL_ERROR
"
${
ret
}
: error"
)
message
(
FATAL_ERROR
"
${
ret
}
: error"
)
endif
(
NOT
${
ret
}
STREQUAL 0
)
endif
(
NOT
${
ret
}
STREQUAL 0
)
file
(
GLOB S1AP_source
${
S1AP_C_DIR
}
/*.c
)
file
(
GLOB S1AP_source
${
S1AP_C_DIR
}
/*.c
)
file
(
GLOB s1ap_h
${
S1AP_C_DIR
}
/*.h
)
add_custom_target
(
set
(
s1ap_h
${
s1ap_h
}
)
s1ap_flag ALL
${
OPENAIR_CMAKE
}
/tools/make_asn1c_includes.sh
"
${
S1AP_C_DIR
}
"
"
${
S1AP_ASN_DIR
}
/
${
S1AP_ASN_FILES
}
"
"S1AP_"
-fno-include-deps
add_custom_command
(
DEPENDS
"
${
S1AP_ASN_DIR
}
/
${
S1AP_ASN_FILES
}
"
OUTPUT
${
S1AP_C_DIR
}
/S1AP_asn_constant.h
COMMAND mkdir -p
${
S1AP_C_DIR
}
COMMAND env
"ASN1C_PREFIX=S1AP_"
asn1c -pdu=all -fcompound-names -fno-include-deps -gen-PER -no-gen-OER -no-gen-example -D
${
S1AP_C_DIR
}
${
S1AP_ASN_DIR
}
/
${
S1AP_ASN_FILES
}
DEPENDS
${
S1AP_ASN_DIR
}
/
${
S1AP_ASN_FILES
}
)
)
add_library
(
S1AP_LIB
add_library
(
S1AP_LIB
${
S1AP_source
}
${
S1AP_source
}
${
S1AP_DIR
}
/s1ap_common.c
${
S1AP_DIR
}
/s1ap_common.c
)
)
add_dependencies
(
S1AP_LIB rrc_flag s1ap_flag
)
include_directories
(
"
${
S1AP_C_DIR
}
"
)
include_directories
(
"
${
S1AP_C_DIR
}
"
)
include_directories
(
"
${
S1AP_DIR
}
"
)
include_directories
(
"
${
S1AP_DIR
}
"
)
...
@@ -418,6 +409,7 @@ add_library(S1AP_ENB
...
@@ -418,6 +409,7 @@ add_library(S1AP_ENB
${
S1AP_DIR
}
/s1ap_eNB_trace.c
${
S1AP_DIR
}
/s1ap_eNB_trace.c
${
S1AP_DIR
}
/s1ap_eNB_ue_context.c
${
S1AP_DIR
}
/s1ap_eNB_ue_context.c
)
)
add_dependencies
(
S1AP_ENB rrc_flag s1ap_flag
)
#X2AP
#X2AP
# Same limitation as described in RRC/S1AP: unknown generated file list
# Same limitation as described in RRC/S1AP: unknown generated file list
...
@@ -445,22 +437,19 @@ endif(${X2AP_RELEASE} STREQUAL "R8")
...
@@ -445,22 +437,19 @@ endif(${X2AP_RELEASE} STREQUAL "R8")
add_definitions
(
-DX2AP_VERSION=
${
X2AP_VERSION
}
)
add_definitions
(
-DX2AP_VERSION=
${
X2AP_VERSION
}
)
set
(
X2AP_ASN_DIR
${
X2AP_DIR
}
/MESSAGES/ASN1/
${
X2AP_RELEASE
}
)
set
(
X2AP_ASN_DIR
${
X2AP_DIR
}
/MESSAGES/ASN1/
${
X2AP_RELEASE
}
)
set
(
X2AP_C_DIR
${
asn1_generated_dir
}
/X2AP_
${
X2AP_RELEASE
}
)
set
(
X2AP_C_DIR
${
asn1_generated_dir
}
/X2AP_
${
X2AP_RELEASE
}
)
message
(
"calling ASN1C_PREFIX=X2AP_ asn1c -pdu=all -fcompound-names -fno-include-deps -gen-PER -no-gen-OER -no-gen-example -D
${
X2AP_C_DIR
}
${
X2AP_ASN_DIR
}
/
${
X2AP_ASN_FILES
}
"
)
execute_process
(
COMMAND mkdir -p
${
X2AP_C_DIR
}
# Warning: if you modify ASN.1 source file to generate new C files, cmake should be re-run instead of make
COMMAND env
"ASN1C_PREFIX=X2AP_"
asn1c -pdu=all -fcompound-names -fno-include-deps -gen-PER -no-gen-OER -no-gen-example -D
${
X2AP_C_DIR
}
${
X2AP_ASN_DIR
}
/
${
X2AP_ASN_FILES
}
execute_process
(
COMMAND
${
OPENAIR_CMAKE
}
/tools/make_asn1c_includes.sh
"
${
X2AP_C_DIR
}
"
"
${
X2AP_ASN_DIR
}
/
${
X2AP_ASN_FILES
}
"
"X2AP_"
-fno-include-deps
RESULT_VARIABLE ret
)
RESULT_VARIABLE ret
)
if
(
NOT
${
ret
}
STREQUAL 0
)
if
(
NOT
${
ret
}
STREQUAL 0
)
message
(
FATAL_ERROR
"
${
ret
}
: error"
)
message
(
FATAL_ERROR
"
${
ret
}
: error"
)
endif
(
NOT
${
ret
}
STREQUAL 0
)
endif
(
NOT
${
ret
}
STREQUAL 0
)
file
(
GLOB X2AP_source
${
X2AP_C_DIR
}
/*.c
)
file
(
GLOB x2ap_h
${
X2AP_C_DIR
}
/*.h
)
file
(
GLOB X2AP_source
${
X2AP_C_DIR
}
/*.c
)
set
(
x2ap_h
${
x2ap_h
}
)
add_custom_command
(
add_custom_target
(
OUTPUT
${
X2AP_C_DIR
}
/X2AP_asn_constant.h
x2_flag ALL
COMMAND mkdir -p
${
X2AP_C_DIR
}
COMMAND
${
OPENAIR_CMAKE
}
/tools/make_asn1c_includes.sh
"
${
X2AP_C_DIR
}
"
"
${
X2AP_ASN_DIR
}
/
${
X2AP_ASN_FILES
}
"
"X2AP_"
-fno-include-deps
COMMAND env
"ASN1C_PREFIX=X2AP_"
asn1c -pdu=all -fcompound-names -fno-include-deps -gen-PER -no-gen-OER -no-gen-example -D
${
X2AP_C_DIR
}
${
X2AP_ASN_DIR
}
/
${
X2AP_ASN_FILES
}
DEPENDS
${
X2AP_ASN_DIR
}
/
${
X2AP_ASN_FILES
}
DEPENDS
${
X2AP_ASN_DIR
}
/
${
X2AP_ASN_FILES
}
)
)
...
@@ -468,6 +457,7 @@ add_library(X2AP_LIB
...
@@ -468,6 +457,7 @@ add_library(X2AP_LIB
${
X2AP_source
}
${
X2AP_source
}
${
X2AP_DIR
}
/x2ap_common.c
${
X2AP_DIR
}
/x2ap_common.c
)
)
add_dependencies
(
X2AP_LIB rrc_flag x2_flag
)
include_directories
(
"
${
X2AP_C_DIR
}
"
)
include_directories
(
"
${
X2AP_C_DIR
}
"
)
include_directories
(
"
${
X2AP_DIR
}
"
)
include_directories
(
"
${
X2AP_DIR
}
"
)
...
@@ -481,6 +471,7 @@ add_library(X2AP_ENB
...
@@ -481,6 +471,7 @@ add_library(X2AP_ENB
${
X2AP_DIR
}
/x2ap_eNB_management_procedures.c
${
X2AP_DIR
}
/x2ap_eNB_management_procedures.c
${
X2AP_DIR
}
/x2ap_eNB_generate_messages.c
${
X2AP_DIR
}
/x2ap_eNB_generate_messages.c
)
)
add_dependencies
(
X2AP_ENB rrc_flag x2_flag
)
# Hardware dependant options
# Hardware dependant options
###################################
###################################
...
@@ -872,6 +863,7 @@ add_library(FLEXRAN_AGENT
...
@@ -872,6 +863,7 @@ add_library(FLEXRAN_AGENT
${
OPENAIR2_DIR
}
/ENB_APP/CONTROL_MODULES/MAC/flexran_agent_mac_internal.c
${
OPENAIR2_DIR
}
/ENB_APP/CONTROL_MODULES/MAC/flexran_agent_mac_internal.c
${
OPENAIR2_DIR
}
/ENB_APP/CONTROL_MODULES/MAC/flexran_agent_mac_slice_verification.c
${
OPENAIR2_DIR
}
/ENB_APP/CONTROL_MODULES/MAC/flexran_agent_mac_slice_verification.c
)
)
add_dependencies
(
FLEXRAN_AGENT rrc_flag
)
set
(
FLEXRAN_AGENT_LIB FLEXRAN_AGENT
)
set
(
FLEXRAN_AGENT_LIB FLEXRAN_AGENT
)
#include_directories(${OPENAIR2_DIR}/ENB_APP)
#include_directories(${OPENAIR2_DIR}/ENB_APP)
...
@@ -937,6 +929,7 @@ set(UTIL_SRC
...
@@ -937,6 +929,7 @@ set(UTIL_SRC
# ${OPENAIR2_DIR}/UTIL/OTG/otg_rx.c
# ${OPENAIR2_DIR}/UTIL/OTG/otg_rx.c
)
)
add_library
(
UTIL
${
UTIL_SRC
}
)
add_library
(
UTIL
${
UTIL_SRC
}
)
add_dependencies
(
UTIL rrc_flag
)
#set(OMG_SUMO_SRC
#set(OMG_SUMO_SRC
# ${OPENAIR2_DIR}/UTIL/OMG/client_traci_OMG.c
# ${OPENAIR2_DIR}/UTIL/OMG/client_traci_OMG.c
...
@@ -976,12 +969,14 @@ set(SCHED_SRC
...
@@ -976,12 +969,14 @@ set(SCHED_SRC
${
OPENAIR1_DIR
}
/SCHED/phy_procedures_lte_common.c
${
OPENAIR1_DIR
}
/SCHED/phy_procedures_lte_common.c
)
)
add_library
(
SCHED_LIB
${
SCHED_SRC
}
)
add_library
(
SCHED_LIB
${
SCHED_SRC
}
)
add_dependencies
(
SCHED_LIB rrc_flag
)
set
(
SCHED_SRC_RU
set
(
SCHED_SRC_RU
${
OPENAIR1_DIR
}
/SCHED/ru_procedures.c
${
OPENAIR1_DIR
}
/SCHED/ru_procedures.c
${
OPENAIR1_DIR
}
/SCHED/prach_procedures.c
${
OPENAIR1_DIR
}
/SCHED/prach_procedures.c
)
)
add_library
(
SCHED_RU_LIB
${
SCHED_SRC_RU
}
)
add_library
(
SCHED_RU_LIB
${
SCHED_SRC_RU
}
)
add_dependencies
(
SCHED_RU_LIB rrc_flag
)
set
(
SCHED_SRC_UE
set
(
SCHED_SRC_UE
${
OPENAIR1_DIR
}
/SCHED_UE/phy_procedures_lte_ue.c
${
OPENAIR1_DIR
}
/SCHED_UE/phy_procedures_lte_ue.c
...
@@ -991,6 +986,7 @@ set(SCHED_SRC_UE
...
@@ -991,6 +986,7 @@ set(SCHED_SRC_UE
${
OPENAIR1_DIR
}
/SCHED_UE/srs_pc.c
${
OPENAIR1_DIR
}
/SCHED_UE/srs_pc.c
)
)
add_library
(
SCHED_UE_LIB
${
SCHED_SRC_UE
}
)
add_library
(
SCHED_UE_LIB
${
SCHED_SRC_UE
}
)
add_dependencies
(
SCHED_UE_LIB rrc_flag
)
# nFAPI
# nFAPI
#################################
#################################
...
@@ -1042,6 +1038,7 @@ set(NFAPI_USER_SRC
...
@@ -1042,6 +1038,7 @@ set(NFAPI_USER_SRC
${
NFAPI_USER_DIR
}
/nfapi_vnf.c
${
NFAPI_USER_DIR
}
/nfapi_vnf.c
)
)
add_library
(
NFAPI_USER_LIB
${
NFAPI_USER_SRC
}
)
add_library
(
NFAPI_USER_LIB
${
NFAPI_USER_SRC
}
)
add_dependencies
(
NFAPI_USER_LIB rrc_flag
)
include_directories
(
${
NFAPI_USER_DIR
}
)
include_directories
(
${
NFAPI_USER_DIR
}
)
# Layer 1
# Layer 1
...
@@ -1060,9 +1057,6 @@ set(PHY_TURBOIF
...
@@ -1060,9 +1057,6 @@ set(PHY_TURBOIF
add_library
(
coding MODULE
${
PHY_TURBOSRC
}
)
add_library
(
coding MODULE
${
PHY_TURBOSRC
}
)
set
(
PHY_SRC_COMMON
set
(
PHY_SRC_COMMON
# depend on code generation from asn1c
${
RRC_FULL_DIR
}
/asn_constant.h
# actual source
${
OPENAIR1_DIR
}
/PHY/LTE_TRANSPORT/dci_tools_common.c
${
OPENAIR1_DIR
}
/PHY/LTE_TRANSPORT/dci_tools_common.c
${
OPENAIR1_DIR
}
/PHY/LTE_TRANSPORT/lte_mcs.c
${
OPENAIR1_DIR
}
/PHY/LTE_TRANSPORT/lte_mcs.c
# ${OPENAIR1_DIR}/PHY/LTE_TRANSPORT/slss.c
# ${OPENAIR1_DIR}/PHY/LTE_TRANSPORT/slss.c
...
@@ -1113,7 +1107,6 @@ set(PHY_SRC_COMMON
...
@@ -1113,7 +1107,6 @@ set(PHY_SRC_COMMON
)
)
set
(
PHY_SRC
set
(
PHY_SRC
# actual source
${
OPENAIR1_DIR
}
/PHY/LTE_TRANSPORT/pss.c
${
OPENAIR1_DIR
}
/PHY/LTE_TRANSPORT/pss.c
${
OPENAIR1_DIR
}
/PHY/LTE_TRANSPORT/sss.c
${
OPENAIR1_DIR
}
/PHY/LTE_TRANSPORT/sss.c
${
OPENAIR1_DIR
}
/PHY/LTE_TRANSPORT/sss_gen.c
${
OPENAIR1_DIR
}
/PHY/LTE_TRANSPORT/sss_gen.c
...
@@ -1141,7 +1134,6 @@ set(PHY_SRC
...
@@ -1141,7 +1134,6 @@ set(PHY_SRC
)
)
set
(
PHY_SRC_RU
set
(
PHY_SRC_RU
# actual source
${
OPENAIR1_DIR
}
/PHY/LTE_TRANSPORT/if4_tools.c
${
OPENAIR1_DIR
}
/PHY/LTE_TRANSPORT/if4_tools.c
${
OPENAIR1_DIR
}
/PHY/LTE_TRANSPORT/if5_tools.c
${
OPENAIR1_DIR
}
/PHY/LTE_TRANSPORT/if5_tools.c
${
OPENAIR1_DIR
}
/PHY/MODULATION/slot_fep_ul.c
${
OPENAIR1_DIR
}
/PHY/MODULATION/slot_fep_ul.c
...
@@ -1155,7 +1147,6 @@ set(PHY_SRC_RU
...
@@ -1155,7 +1147,6 @@ set(PHY_SRC_RU
)
)
set
(
PHY_SRC_UE
set
(
PHY_SRC_UE
# actual source
${
OPENAIR1_DIR
}
/PHY/LTE_UE_TRANSPORT/sss_ue.c
${
OPENAIR1_DIR
}
/PHY/LTE_UE_TRANSPORT/sss_ue.c
${
OPENAIR1_DIR
}
/PHY/LTE_TRANSPORT/sss_gen.c
${
OPENAIR1_DIR
}
/PHY/LTE_TRANSPORT/sss_gen.c
${
OPENAIR1_DIR
}
/PHY/LTE_UE_TRANSPORT/dlsch_demodulation.c
${
OPENAIR1_DIR
}
/PHY/LTE_UE_TRANSPORT/dlsch_demodulation.c
...
@@ -1204,9 +1195,13 @@ if (${COMPILATION_AVX2} STREQUAL "True")
...
@@ -1204,9 +1195,13 @@ if (${COMPILATION_AVX2} STREQUAL "True")
endif
()
endif
()
add_library
(
PHY_COMMON
${
PHY_SRC_COMMON
}
)
add_library
(
PHY_COMMON
${
PHY_SRC_COMMON
}
)
add_dependencies
(
PHY_COMMON rrc_flag
)
add_library
(
PHY
${
PHY_SRC
}
)
add_library
(
PHY
${
PHY_SRC
}
)
add_dependencies
(
PHY rrc_flag
)
add_library
(
PHY_UE
${
PHY_SRC_UE
}
)
add_library
(
PHY_UE
${
PHY_SRC_UE
}
)
add_dependencies
(
PHY_UE rrc_flag
)
add_library
(
PHY_RU
${
PHY_SRC_RU
}
)
add_library
(
PHY_RU
${
PHY_SRC_RU
}
)
add_dependencies
(
PHY_RU rrc_flag
)
#Library for mex functions
#Library for mex functions
#########################3
#########################3
...
@@ -1376,11 +1371,13 @@ add_library(L2
...
@@ -1376,11 +1371,13 @@ add_library(L2
${
MAC_SRC
}
${
MAC_SRC
}
${
ENB_APP_SRC
}
)
${
ENB_APP_SRC
}
)
# ${OPENAIR2_DIR}/RRC/L2_INTERFACE/openair_rrc_L2_interface.c)
# ${OPENAIR2_DIR}/RRC/L2_INTERFACE/openair_rrc_L2_interface.c)
add_dependencies
(
L2 rrc_flag s1ap_flag x2_flag
)
add_library
(
L2_UE
add_library
(
L2_UE
${
L2_SRC_UE
}
${
L2_SRC_UE
}
${
MAC_SRC_UE
}
${
MAC_SRC_UE
}
)
)
add_dependencies
(
L2_UE rrc_flag s1ap_flag x2_flag
)
include_directories
(
${
NFAPI_USER_DIR
}
)
include_directories
(
${
NFAPI_USER_DIR
}
)
...
@@ -1406,6 +1403,7 @@ set (GTPV1U_SRC
...
@@ -1406,6 +1403,7 @@ set (GTPV1U_SRC
${
GTPV1U_DIR
}
/gtpv1u_teid_pool.c
${
GTPV1U_DIR
}
/gtpv1u_teid_pool.c
)
)
add_library
(
GTPV1U
${
GTPV1U_SRC
}
)
add_library
(
GTPV1U
${
GTPV1U_SRC
}
)
add_dependencies
(
GTPV1U rrc_flag
)
set
(
SCTP_SRC
set
(
SCTP_SRC
${
OPENAIR3_DIR
}
/SCTP/sctp_common.c
${
OPENAIR3_DIR
}
/SCTP/sctp_common.c
...
@@ -1413,8 +1411,10 @@ set(SCTP_SRC
...
@@ -1413,8 +1411,10 @@ set(SCTP_SRC
${
OPENAIR3_DIR
}
/SCTP/sctp_eNB_itti_messaging.c
${
OPENAIR3_DIR
}
/SCTP/sctp_eNB_itti_messaging.c
)
)
add_library
(
SCTP_CLIENT
${
SCTP_SRC
}
)
add_library
(
SCTP_CLIENT
${
SCTP_SRC
}
)
add_dependencies
(
SCTP_CLIENT rrc_flag
)
add_library
(
UDP
${
OPENAIR3_DIR
}
/UDP/udp_eNB_task.c
)
add_library
(
UDP
${
OPENAIR3_DIR
}
/UDP/udp_eNB_task.c
)
add_dependencies
(
UDP rrc_flag
)
set
(
NAS_SRC
${
OPENAIR3_DIR
}
/NAS/
)
set
(
NAS_SRC
${
OPENAIR3_DIR
}
/NAS/
)
...
@@ -1663,6 +1663,7 @@ if(NAS_UE)
...
@@ -1663,6 +1663,7 @@ if(NAS_UE)
${
libnas_ue_esm_OBJS
}
${
libnas_ue_esm_OBJS
}
${
libnas_ue_esm_sap_OBJS
}
${
libnas_ue_esm_sap_OBJS
}
)
)
add_dependencies
(
LIB_NAS_UE rrc_flag
)
set
(
NAS_UE_LIB LIB_NAS_UE
)
set
(
NAS_UE_LIB LIB_NAS_UE
)
include_directories
(
${
NAS_SRC
}
UE
)
include_directories
(
${
NAS_SRC
}
UE
)
...
@@ -1920,8 +1921,6 @@ add_definitions(-DASN1_MINIMUM_VERSION=924)
...
@@ -1920,8 +1921,6 @@ add_definitions(-DASN1_MINIMUM_VERSION=924)
###################################################
###################################################
add_executable
(
lte-softmodem
add_executable
(
lte-softmodem
${
rrc_h
}
${
s1ap_h
}
${
OPENAIR_TARGETS
}
/RT/USER/rt_wrapper.c
${
OPENAIR_TARGETS
}
/RT/USER/rt_wrapper.c
${
OPENAIR_TARGETS
}
/RT/USER/lte-enb.c
${
OPENAIR_TARGETS
}
/RT/USER/lte-enb.c
${
OPENAIR_TARGETS
}
/RT/USER/lte-ru.c
${
OPENAIR_TARGETS
}
/RT/USER/lte-ru.c
...
@@ -1944,6 +1943,7 @@ add_executable(lte-softmodem
...
@@ -1944,6 +1943,7 @@ add_executable(lte-softmodem
${
CONFIG_SOURCES
}
${
CONFIG_SOURCES
}
${
SHLIB_LOADER_SOURCES
}
${
SHLIB_LOADER_SOURCES
}
)
)
add_dependencies
(
lte-softmodem rrc_flag s1ap_flag x2_flag
)
target_link_libraries
(
lte-softmodem
target_link_libraries
(
lte-softmodem
-Wl,--start-group
-Wl,--start-group
...
@@ -1960,8 +1960,6 @@ target_link_libraries (lte-softmodem ${T_LIB})
...
@@ -1960,8 +1960,6 @@ target_link_libraries (lte-softmodem ${T_LIB})
# lte-softmodem-nos1 is both eNB and UE implementation
# lte-softmodem-nos1 is both eNB and UE implementation
###################################################
###################################################
add_executable
(
lte-softmodem-nos1
add_executable
(
lte-softmodem-nos1
${
rrc_h
}
${
s1ap_h
}
${
OPENAIR_TARGETS
}
/RT/USER/rt_wrapper.c
${
OPENAIR_TARGETS
}
/RT/USER/rt_wrapper.c
${
OPENAIR_TARGETS
}
/RT/USER/lte-enb.c
${
OPENAIR_TARGETS
}
/RT/USER/lte-enb.c
${
OPENAIR_TARGETS
}
/RT/USER/lte-ru.c
${
OPENAIR_TARGETS
}
/RT/USER/lte-ru.c
...
@@ -1983,6 +1981,7 @@ add_executable(lte-softmodem-nos1
...
@@ -1983,6 +1981,7 @@ add_executable(lte-softmodem-nos1
${
CONFIG_SOURCES
}
${
CONFIG_SOURCES
}
${
SHLIB_LOADER_SOURCES
}
${
SHLIB_LOADER_SOURCES
}
)
)
add_dependencies
(
lte-softmodem-nos1 rrc_flag s1ap_flag x2_flag
)
target_link_libraries
(
lte-softmodem-nos1
target_link_libraries
(
lte-softmodem-nos1
-Wl,--start-group
-Wl,--start-group
RRC_LIB SECU_CN SECU_OSA UTIL HASHTABLE SCHED_LIB SCHED_RU_LIB PHY_COMMON PHY PHY_RU LFDS L2
${
RAL_LIB
}
${
ITTI_LIB
}
RRC_LIB SECU_CN SECU_OSA UTIL HASHTABLE SCHED_LIB SCHED_RU_LIB PHY_COMMON PHY PHY_RU LFDS L2
${
RAL_LIB
}
${
ITTI_LIB
}
...
@@ -1999,8 +1998,6 @@ target_link_libraries (lte-softmodem-nos1 ${T_LIB})
...
@@ -1999,8 +1998,6 @@ target_link_libraries (lte-softmodem-nos1 ${T_LIB})
#######################################
#######################################
add_executable
(
lte-uesoftmodem
add_executable
(
lte-uesoftmodem
${
rrc_h
}
${
s1ap_h
}
${
OPENAIR_TARGETS
}
/RT/USER/rt_wrapper.c
${
OPENAIR_TARGETS
}
/RT/USER/rt_wrapper.c
${
OPENAIR_TARGETS
}
/RT/USER/lte-ue.c
${
OPENAIR_TARGETS
}
/RT/USER/lte-ue.c
${
OPENAIR_TARGETS
}
/RT/USER/lte-uesoftmodem.c
${
OPENAIR_TARGETS
}
/RT/USER/lte-uesoftmodem.c
...
@@ -2023,6 +2020,7 @@ add_executable(lte-uesoftmodem
...
@@ -2023,6 +2020,7 @@ add_executable(lte-uesoftmodem
${
SHLIB_LOADER_SOURCES
}
${
SHLIB_LOADER_SOURCES
}
)
)
add_dependencies
(
lte-uesoftmodem rrc_flag s1ap_flag x2_flag
)
target_link_libraries
(
lte-uesoftmodem
target_link_libraries
(
lte-uesoftmodem
-Wl,--start-group
-Wl,--start-group
RRC_LIB S1AP_LIB S1AP_ENB X2AP_LIB X2AP_ENB GTPV1U SECU_CN SECU_OSA UTIL HASHTABLE SCTP_CLIENT UDP SCHED_RU_LIB SCHED_UE_LIB PHY_COMMON PHY_UE PHY_RU LFDS L2_UE SIMU
RRC_LIB S1AP_LIB S1AP_ENB X2AP_LIB X2AP_ENB GTPV1U SECU_CN SECU_OSA UTIL HASHTABLE SCTP_CLIENT UDP SCHED_RU_LIB SCHED_UE_LIB PHY_COMMON PHY_UE PHY_RU LFDS L2_UE SIMU
...
@@ -2038,8 +2036,6 @@ target_link_libraries (lte-uesoftmodem ${T_LIB})
...
@@ -2038,8 +2036,6 @@ target_link_libraries (lte-uesoftmodem ${T_LIB})
# lte-uesoftmodem-nos1 is UE implementation
# lte-uesoftmodem-nos1 is UE implementation
###################################################
###################################################
add_executable
(
lte-uesoftmodem-nos1
add_executable
(
lte-uesoftmodem-nos1
${
rrc_h
}
${
s1ap_h
}
${
OPENAIR_TARGETS
}
/RT/USER/rt_wrapper.c
${
OPENAIR_TARGETS
}
/RT/USER/rt_wrapper.c
${
OPENAIR_TARGETS
}
/RT/USER/lte-ue.c
${
OPENAIR_TARGETS
}
/RT/USER/lte-ue.c
${
OPENAIR_TARGETS
}
/RT/USER/lte-uesoftmodem.c
${
OPENAIR_TARGETS
}
/RT/USER/lte-uesoftmodem.c
...
@@ -2063,6 +2059,7 @@ add_executable(lte-uesoftmodem-nos1
...
@@ -2063,6 +2059,7 @@ add_executable(lte-uesoftmodem-nos1
${
SHLIB_LOADER_SOURCES
}
${
SHLIB_LOADER_SOURCES
}
)
)
add_dependencies
(
lte-uesoftmodem-nos1 rrc_flag s1ap_flag x2_flag
)
target_link_libraries
(
lte-uesoftmodem-nos1
target_link_libraries
(
lte-uesoftmodem-nos1
-Wl,--start-group
-Wl,--start-group
RRC_LIB SECU_CN SECU_OSA UTIL HASHTABLE SCHED_RU_LIB SCHED_UE_LIB PHY_COMMON PHY_UE PHY_RU LFDS L2_UE SIMU
${
RAL_LIB
}
${
ITTI_LIB
}
RRC_LIB SECU_CN SECU_OSA UTIL HASHTABLE SCHED_RU_LIB SCHED_UE_LIB PHY_COMMON PHY_UE PHY_RU LFDS L2_UE SIMU
${
RAL_LIB
}
${
ITTI_LIB
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment