|
|
|
@@ -703,12 +703,6 @@ add_boolean_option(RRC_DEFAULT_RAB_IS_AM False "Otherwise it is UM, confi
|
|
|
|
|
##########################
|
|
|
|
|
# none
|
|
|
|
|
|
|
|
|
|
##########################
|
|
|
|
|
# PROJECTS (IST, FRENCH COLL., etc)
|
|
|
|
|
# SPECIFIC OPTIONS
|
|
|
|
|
##########################
|
|
|
|
|
add_boolean_option(MIH_C_MEDIEVAL_EXTENSIONS False "EXTENSIONS TO MIH 802.21 IN CONTEXT OF IST PROJECT CALLED MEDIEVAL")
|
|
|
|
|
|
|
|
|
|
# add the binary tree to the search path for include files
|
|
|
|
|
#######################################################
|
|
|
|
|
# We will find ConfigOAI.h after generation in target directory
|
|
|
|
@@ -1208,26 +1202,6 @@ if (${ENABLE_RAL})
|
|
|
|
|
set(RAL_LIB RAL)
|
|
|
|
|
endif()
|
|
|
|
|
|
|
|
|
|
if(${MIH_C_MEDIEVAL_EXTENSIONS})
|
|
|
|
|
set(MIH_SRC
|
|
|
|
|
${RAL_LTE_DIR}INTERFACE-802.21/C/MIH_C_header_codec.c
|
|
|
|
|
${RAL_LTE_DIR}INTERFACE-802.21/C/MIH_C_msg_codec.c
|
|
|
|
|
${RAL_LTE_DIR}INTERFACE-802.21/C/MIH_C_primitive_codec.c
|
|
|
|
|
${RAL_LTE_DIR}INTERFACE-802.21/C/MIH_C_F1_basic_data_types_codec.c
|
|
|
|
|
${RAL_LTE_DIR}INTERFACE-802.21/C/MIH_C_F2_general_data_types_codec.c
|
|
|
|
|
${RAL_LTE_DIR}INTERFACE-802.21/C/MIH_C_F3_data_types_for_address_codec.c
|
|
|
|
|
${RAL_LTE_DIR}INTERFACE-802.21/C/MIH_C_F4_data_types_for_links_codec.c
|
|
|
|
|
${RAL_LTE_DIR}INTERFACE-802.21/C/MIH_C_F9_data_types_for_qos_codec.c
|
|
|
|
|
${RAL_LTE_DIR}INTERFACE-802.21/C/MIH_C_F13_data_types_for_information_elements_codec.c
|
|
|
|
|
${RAL_LTE_DIR}INTERFACE-802.21/C/MIH_C_L2_type_values_for_tlv_encoding.c
|
|
|
|
|
${RAL_LTE_DIR}INTERFACE-802.21/C/MIH_C_Medieval_extensions.c
|
|
|
|
|
${RAL_LTE_DIR}INTERFACE-802.21/C/MIH_C_bit_buffer.c
|
|
|
|
|
${RAL_LTE_DIR}INTERFACE-802.21/C/MIH_C.c
|
|
|
|
|
)
|
|
|
|
|
add_library(MIH ${MIH_SRC})
|
|
|
|
|
set(MIH_LIB MIH)
|
|
|
|
|
endif()
|
|
|
|
|
|
|
|
|
|
# CN libs
|
|
|
|
|
##########################
|
|
|
|
|
|
|
|
|
@@ -1750,7 +1724,7 @@ add_executable(lte-softmodem
|
|
|
|
|
|
|
|
|
|
target_link_libraries (lte-softmodem -ldl
|
|
|
|
|
-Wl,--start-group
|
|
|
|
|
RRC_LIB S1AP_LIB S1AP_ENB GTPV1U SECU_CN SECU_OSA UTIL HASHTABLE SCTP_CLIENT UDP SCHED_LIB PHY LFDS L2 ${MSC_LIB} ${RAL_LIB} ${NAS_UE_LIB} ${ITTI_LIB} ${MIH_LIB} ${FLPT_MSG_LIB} ${ASYNC_IF_LIB} ${FLEXRAN_AGENT_LIB} LFDS7
|
|
|
|
|
RRC_LIB S1AP_LIB S1AP_ENB GTPV1U SECU_CN SECU_OSA UTIL HASHTABLE SCTP_CLIENT UDP SCHED_LIB PHY LFDS L2 ${MSC_LIB} ${RAL_LIB} ${NAS_UE_LIB} ${ITTI_LIB} ${FLPT_MSG_LIB} ${ASYNC_IF_LIB} ${FLEXRAN_AGENT_LIB} LFDS7
|
|
|
|
|
-Wl,--end-group )
|
|
|
|
|
|
|
|
|
|
target_link_libraries (lte-softmodem ${LIBXML2_LIBRARIES})
|
|
|
|
@@ -1785,7 +1759,7 @@ add_executable(lte-softmodem-nos1
|
|
|
|
|
)
|
|
|
|
|
target_link_libraries (lte-softmodem-nos1
|
|
|
|
|
-Wl,--start-group
|
|
|
|
|
RRC_LIB SECU_CN SECU_OSA UTIL HASHTABLE SCHED_LIB PHY LFDS L2 ${MSC_LIB} ${RAL_LIB} ${ITTI_LIB} ${MIH_LIB} ${FLPT_MSG_LIB} ${ASYNC_IF_LIB} ${FLEXRAN_AGENT_LIB} LFDS7
|
|
|
|
|
RRC_LIB SECU_CN SECU_OSA UTIL HASHTABLE SCHED_LIB PHY LFDS L2 ${MSC_LIB} ${RAL_LIB} ${ITTI_LIB} ${FLPT_MSG_LIB} ${ASYNC_IF_LIB} ${FLEXRAN_AGENT_LIB} LFDS7
|
|
|
|
|
-Wl,--end-group )
|
|
|
|
|
|
|
|
|
|
target_link_libraries (lte-softmodem-nos1 ${LIBXML2_LIBRARIES})
|
|
|
|
@@ -1856,7 +1830,7 @@ add_executable(oaisim
|
|
|
|
|
target_include_directories(oaisim PUBLIC ${OPENAIR_TARGETS}/SIMU/USER)
|
|
|
|
|
target_link_libraries (oaisim
|
|
|
|
|
-Wl,-ldl,--start-group
|
|
|
|
|
RRC_LIB S1AP_LIB S1AP_ENB X2AP_LIB GTPV1U SECU_CN UTIL HASHTABLE SCTP_CLIENT UDP SCHED_LIB PHY LFDS ${MSC_LIB} L2 ${RAL_LIB} LIB_NAS_UE SIMU SECU_OSA ${ITTI_LIB} ${MIH_LIB}
|
|
|
|
|
RRC_LIB S1AP_LIB S1AP_ENB X2AP_LIB GTPV1U SECU_CN UTIL HASHTABLE SCTP_CLIENT UDP SCHED_LIB PHY LFDS ${MSC_LIB} L2 ${RAL_LIB} LIB_NAS_UE SIMU SECU_OSA ${ITTI_LIB}
|
|
|
|
|
-Wl,--end-group )
|
|
|
|
|
|
|
|
|
|
target_link_libraries (oaisim ${LIBXML2_LIBRARIES} ${LAPACK_LIBRARIES})
|
|
|
|
@@ -1899,7 +1873,7 @@ add_executable(oaisim_nos1
|
|
|
|
|
target_include_directories(oaisim_nos1 PUBLIC ${OPENAIR_TARGETS}/SIMU/USER)
|
|
|
|
|
target_link_libraries (oaisim_nos1
|
|
|
|
|
-Wl,--start-group
|
|
|
|
|
RRC_LIB X2AP_LIB SECU_CN UTIL HASHTABLE SCHED_LIB PHY LFDS ${MSC_LIB} L2 ${RAL_LIB} SIMU SECU_OSA ${ITTI_LIB} ${MIH_LIB} ${FLPT_MSG_LIB} ${ASYNC_IF_LIB} ${FLEXRAN_AGENT_LIB} LFDS7
|
|
|
|
|
RRC_LIB X2AP_LIB SECU_CN UTIL HASHTABLE SCHED_LIB PHY LFDS ${MSC_LIB} L2 ${RAL_LIB} SIMU SECU_OSA ${ITTI_LIB} ${FLPT_MSG_LIB} ${ASYNC_IF_LIB} ${FLEXRAN_AGENT_LIB} LFDS7
|
|
|
|
|
-Wl,--end-group )
|
|
|
|
|
|
|
|
|
|
target_link_libraries (oaisim_nos1 ${LIBXML2_LIBRARIES} ${LAPACK_LIBRARIES})
|
|
|
|
@@ -2015,7 +1989,7 @@ if (${T_TRACER})
|
|
|
|
|
oai_exmimodevif oai_usrpdevif oai_bladerfdevif oai_lmssdrdevif
|
|
|
|
|
oai_eth_transpro
|
|
|
|
|
FLPT_MSG ASYNC_IF FLEXRAN_AGENT HASHTABLE MSC UTIL OMG_SUMO SECU_OSA
|
|
|
|
|
SECU_CN SCHED_LIB PHY L2 default_sched remote_sched RAL MIH CN_UTILS
|
|
|
|
|
SECU_CN SCHED_LIB PHY L2 default_sched remote_sched RAL CN_UTILS
|
|
|
|
|
GTPV1U SCTP_CLIENT UDP LIB_NAS_UE LFDS LFDS7 SIMU OPENAIR0_LIB)
|
|
|
|
|
if (TARGET ${i})
|
|
|
|
|
add_dependencies(${i} generate_T)
|
|
|
|
|
bruno mongazon