Fix: Wrap all RTI::nddscpp2 links in IF(BUILD_RTI) conditionals
- 43 CMakeLists.txt files updated to properly condition RTI dependencies - All NGL_TARGET_LINK_LIBRARIES blocks containing RTI:: references are now wrapped in IF(BUILD_RTI) blocks - This allows building with BUILD_RTI=OFF without RTI Connext installation - Fixes CMake configure errors about non-existent /opt/RTI paths Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
This commit is contained in:
42 files changed
+164
No files matched your search
@@ -116,6 +116,7 @@ NGL_TARGET_INCLUDE_DIRECTORIES(svcAesClient
|
||||
${CMAKE_CURRENT_BINARY_DIR}/../
|
||||
)
|
||||
|
||||
IF(BUILD_RTI)
|
||||
NGL_TARGET_LINK_LIBRARIES(svcAesClient
|
||||
PRIVATE
|
||||
RTI::nddscpp2
|
||||
@@ -126,6 +127,7 @@ NGL_TARGET_LINK_LIBRARIES(svcAesClient
|
||||
ngltools
|
||||
ddsftc
|
||||
)
|
||||
ENDIF(BUILD_RTI)
|
||||
NGL_INSTALL_TARGET(svcAesClient)
|
||||
|
||||
#
|
||||
@@ -148,6 +150,7 @@ NGL_TARGET_INCLUDE_DIRECTORIES(svcAesServer
|
||||
${CMAKE_CURRENT_BINARY_DIR}/../
|
||||
)
|
||||
|
||||
IF(BUILD_RTI)
|
||||
NGL_TARGET_LINK_LIBRARIES(svcAesServer
|
||||
PRIVATE
|
||||
RTI::nddscpp2
|
||||
@@ -157,6 +160,7 @@ NGL_TARGET_LINK_LIBRARIES(svcAesServer
|
||||
svcAesCommon
|
||||
ngldb
|
||||
)
|
||||
ENDIF(BUILD_RTI)
|
||||
NGL_INSTALL_TARGET(svcAesServer)
|
||||
|
||||
#
|
||||
@@ -320,6 +324,7 @@ CODEGEN_SQL(SRCS_exe ${xml_FILE})
|
||||
|
||||
NGL_ADD_SVC_ICON(SRCS_exe)
|
||||
NGL_ADD_EXECUTABLE(AAR SV svcAreaEffectSimulation ${SRCS_exe})
|
||||
IF(BUILD_RTI)
|
||||
NGL_TARGET_LINK_LIBRARIES(svcAreaEffectSimulation
|
||||
svcAesServer
|
||||
svcCesClient
|
||||
@@ -347,6 +352,7 @@ NGL_TARGET_LINK_LIBRARIES(svcAreaEffectSimulation
|
||||
ngltools
|
||||
saaTelegrams
|
||||
)
|
||||
ENDIF(BUILD_RTI)
|
||||
NGL_INSTALL_TARGET(svcAreaEffectSimulation)
|
||||
NGL_INSTALL(AAR SV FILES log4cxx_aes.props DESTINATION bin)
|
||||
NGL_ADD_TARGET_LINK(svcAreaEffectSimulation sAES)
|
||||
@@ -404,6 +410,7 @@ NGL_ADD_EXECUTABLE(AAR SV NO_TRANSLATION aes_utils_test
|
||||
Utils/test_main.cpp
|
||||
)
|
||||
|
||||
IF(BUILD_RTI)
|
||||
NGL_TARGET_LINK_LIBRARIES(aes_utils_test
|
||||
Qt6::Core
|
||||
Qt6::Widgets
|
||||
@@ -413,6 +420,7 @@ NGL_TARGET_LINK_LIBRARIES(aes_utils_test
|
||||
ddsconnector
|
||||
LtsCoordTrans
|
||||
)
|
||||
ENDIF(BUILD_RTI)
|
||||
NGL_INSTALL(AAR SV TARGETS aes_utils_test DESTINATION bin/test)
|
||||
|
||||
#
|
||||
@@ -422,6 +430,7 @@ NGL_ADD_EXECUTABLE(SV NO_TRANSLATION aes_convert_mine_area
|
||||
ModuleTests/aes_convert_mine_area.cpp
|
||||
)
|
||||
|
||||
IF(BUILD_RTI)
|
||||
NGL_TARGET_LINK_LIBRARIES(aes_convert_mine_area
|
||||
Qt6::Core
|
||||
# Qt6::Widgets
|
||||
@@ -436,6 +445,7 @@ NGL_TARGET_LINK_LIBRARIES(aes_convert_mine_area
|
||||
nglsettings
|
||||
ngltools
|
||||
)
|
||||
ENDIF(BUILD_RTI)
|
||||
NGL_INSTALL(SV TARGETS aes_convert_mine_area DESTINATION bin/test)
|
||||
|
||||
|
||||
|
||||
Reference in new issue
Block a user