renamed openair-cn to openair3

git-svn-id: http://svn.eurecom.fr/openair4G/trunk@7886 818b1a75-f10b-46b9-bf7c-635c3b92a50f
This commit is contained in:
gauthier
2015-10-06 16:53:42 +00:00
parent c7518ecf42
commit 7b5431a62c
705 changed files with 206 additions and 208 deletions
+13 -13
View File
@@ -47,11 +47,11 @@ endif( NOT DEFINED OPENAIR_DIR)
set(OPENAIR1_DIR ${OPENAIR_DIR}/openair1)
set(OPENAIR2_DIR ${OPENAIR_DIR}/openair2)
set(OPENAIR3_DIR ${OPENAIR_DIR}/openair3)
set(OPENAIRCN_DIR ${OPENAIR_DIR}/openair-cn)
set(OPENAIR3_DIR ${OPENAIR_DIR}/openair3)
set(OPENAIR_TARGETS ${OPENAIR_DIR}/targets)
set(OPENAIR_CMAKE_SCRIPTS ${OPENAIR_DIR}/cmake_targets/tools)
set(OPENAIR_BIN_DIR ${OPENAIR_DIR}/targets/bin)
set(OPENAIR_NAS_DIR ${OPENAIR_DIR}/openair-cn/NAS)
set(OPENAIR_NAS_DIR ${OPENAIR_DIR}/openair3/NAS)
set(CMAKE_MODULE_PATH "${OPENAIR_DIR}/cmake_targets/tools/MODULES" "${CMAKE_MODULE_PATH}")
@@ -131,20 +131,20 @@ add_boolean_option(NAS_MME False "NAS_UE and NAS_MME are incompa
# SECU LIB
################################################################################
set(secu_cn_SRC
${OPENAIRCN_DIR}/SECU/kdf.c
${OPENAIRCN_DIR}/SECU/rijndael.c
${OPENAIRCN_DIR}/SECU/snow3g.c
${OPENAIRCN_DIR}/SECU/key_nas_deriver.c
${OPENAIRCN_DIR}/SECU/nas_stream_eea1.c
${OPENAIRCN_DIR}/SECU/nas_stream_eia1.c
${OPENAIRCN_DIR}/SECU/nas_stream_eea2.c
${OPENAIRCN_DIR}/SECU/nas_stream_eia2.c
${OPENAIR3_DIR}/SECU/kdf.c
${OPENAIR3_DIR}/SECU/rijndael.c
${OPENAIR3_DIR}/SECU/snow3g.c
${OPENAIR3_DIR}/SECU/key_nas_deriver.c
${OPENAIR3_DIR}/SECU/nas_stream_eea1.c
${OPENAIR3_DIR}/SECU/nas_stream_eia1.c
${OPENAIR3_DIR}/SECU/nas_stream_eea2.c
${OPENAIR3_DIR}/SECU/nas_stream_eia2.c
)
add_library(secu_cn ${secu_cn_SRC})
target_include_directories(secu_cn PRIVATE
${OPENAIR_DIR}/common/utils/itti
${OPENAIR_DIR}/openair2/COMMON
${OPENAIRCN_DIR}/UTILS
${OPENAIR3_DIR}/UTILS
)
################################################################################
@@ -657,8 +657,8 @@ target_include_directories(ies PRIVATE
################################################################################
include_directories(
${OPENAIR_DIR}/common/utils/msc
${OPENAIRCN_DIR}/COMMON
${OPENAIRCN_DIR}/SECU
${OPENAIR3_DIR}/COMMON
${OPENAIR3_DIR}/SECU
${OPENAIR_NAS_DIR}/src
${OPENAIR_NAS_DIR}/COMMON
${OPENAIR_NAS_DIR}/COMMON/API/NETWORK