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
@@ -88,6 +88,7 @@ NGL_TARGET_INCLUDE_DIRECTORIES(svcCesDDSCommon
|
||||
${CMAKE_CURRENT_SOURCE_DIR}/../
|
||||
${CMAKE_CURRENT_BINARY_DIR}/../
|
||||
)
|
||||
IF(BUILD_RTI)
|
||||
NGL_TARGET_LINK_LIBRARIES(svcCesDDSCommon
|
||||
PRIVATE
|
||||
ddsconnector
|
||||
@@ -120,6 +121,7 @@ NGL_TARGET_LINK_LIBRARIES(svcCesDDSCommon
|
||||
ArcGISQt5Hack
|
||||
ArcGIS::ArcGIS
|
||||
)
|
||||
ENDIF(BUILD_RTI)
|
||||
NGL_INSTALL_TARGET(svcCesDDSCommon)
|
||||
|
||||
|
||||
@@ -166,6 +168,7 @@ NGL_TARGET_INCLUDE_DIRECTORIES(svcCesClient
|
||||
${CMAKE_CURRENT_BINARY_DIR}/../
|
||||
)
|
||||
|
||||
IF(BUILD_RTI)
|
||||
NGL_TARGET_LINK_LIBRARIES(svcCesClient
|
||||
PRIVATE
|
||||
RTI::nddscpp2
|
||||
@@ -175,6 +178,7 @@ NGL_TARGET_LINK_LIBRARIES(svcCesClient
|
||||
ddsftc
|
||||
|
||||
)
|
||||
ENDIF(BUILD_RTI)
|
||||
NGL_INSTALL_TARGET(svcCesClient)
|
||||
|
||||
#
|
||||
@@ -194,6 +198,7 @@ NGL_TARGET_INCLUDE_DIRECTORIES(svcCesServer
|
||||
${CMAKE_CURRENT_BINARY_DIR}/../
|
||||
)
|
||||
|
||||
IF(BUILD_RTI)
|
||||
NGL_TARGET_LINK_LIBRARIES(svcCesServer
|
||||
PRIVATE
|
||||
RTI::nddscpp2
|
||||
@@ -203,6 +208,7 @@ NGL_TARGET_LINK_LIBRARIES(svcCesServer
|
||||
svcCesCommon
|
||||
ngldb
|
||||
)
|
||||
ENDIF(BUILD_RTI)
|
||||
NGL_INSTALL_TARGET(svcCesServer)
|
||||
|
||||
#
|
||||
|
||||
+2
@@ -45,6 +45,7 @@ NGL_TARGET_INCLUDE_DIRECTORIES(svcCesGeoPairingImpl
|
||||
${CMAKE_CURRENT_SOURCE_DIR}/../
|
||||
${CMAKE_CURRENT_BINARY_DIR}/../
|
||||
)
|
||||
IF(BUILD_RTI)
|
||||
NGL_TARGET_LINK_LIBRARIES(svcCesGeoPairingImpl
|
||||
PRIVATE
|
||||
RTI::nddscpp2
|
||||
@@ -58,3 +59,4 @@ NGL_TARGET_LINK_LIBRARIES(svcCesGeoPairingImpl
|
||||
FW_Ballistic
|
||||
NGLLogger
|
||||
)
|
||||
ENDIF(BUILD_RTI)
|
||||
Reference in new issue
Block a user