Merge remote-tracking branch 'origin/develop-fix-CMakeLists' into integration_2022_wk48
This commit is contained in:
+1
-5
@@ -145,11 +145,7 @@ endif()
|
|||||||
#########################################################
|
#########################################################
|
||||||
# Base directories, compatible with legacy OAI building #
|
# Base directories, compatible with legacy OAI building #
|
||||||
#########################################################
|
#########################################################
|
||||||
set (OPENAIR_DIR $ENV{OPENAIR_DIR})
|
set (OPENAIR_DIR ${CMAKE_SOURCE_DIR})
|
||||||
if("${OPENAIR_DIR}" STREQUAL "")
|
|
||||||
string(REGEX REPLACE "/cmake_targets.*$" "" OPENAIR_DIR ${CMAKE_CURRENT_BINARY_DIR})
|
|
||||||
endif()
|
|
||||||
|
|
||||||
set (NFAPI_DIR ${OPENAIR_DIR}/nfapi/open-nFAPI)
|
set (NFAPI_DIR ${OPENAIR_DIR}/nfapi/open-nFAPI)
|
||||||
set (NFAPI_USER_DIR ${OPENAIR_DIR}/nfapi/oai_integration)
|
set (NFAPI_USER_DIR ${OPENAIR_DIR}/nfapi/oai_integration)
|
||||||
set (OPENAIR1_DIR ${OPENAIR_DIR}/openair1)
|
set (OPENAIR1_DIR ${OPENAIR_DIR}/openair1)
|
||||||
|
|||||||
Reference in New Issue
Block a user