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:
torstenandCopilot committed 2026-08-19 02:41:22 +02:00
1 parent 4a143f09b3
commit 010f91928a
42 files changed
+164

No files matched your search

@@ -70,6 +70,7 @@ NGL_TARGET_INCLUDE_DIRECTORIES(svcBldClient
${CMAKE_CURRENT_BINARY_DIR}/../
)
IF(BUILD_RTI)
NGL_TARGET_LINK_LIBRARIES(svcBldClient
PRIVATE
RTI::nddscpp2
@@ -78,6 +79,7 @@ NGL_TARGET_LINK_LIBRARIES(svcBldClient
svcBldCommon
ddsftc
)
ENDIF(BUILD_RTI)
NGL_INSTALL_TARGET(svcBldClient)
#
@@ -96,6 +98,7 @@ NGL_TARGET_INCLUDE_DIRECTORIES(svcBldServer
${CMAKE_CURRENT_BINARY_DIR}/../
)
IF(BUILD_RTI)
NGL_TARGET_LINK_LIBRARIES(svcBldServer
PRIVATE
RTI::nddscpp2
@@ -105,6 +108,7 @@ NGL_TARGET_LINK_LIBRARIES(svcBldServer
svcBldCommon
ngldb
)
ENDIF(BUILD_RTI)
NGL_INSTALL_TARGET(svcBldServer)
#
@@ -19,6 +19,7 @@ NGL_TARGET_INCLUDE_DIRECTORIES(svcCnrHelper
${CMAKE_CURRENT_BINARY_DIR}/../
)
IF(BUILD_RTI)
NGL_TARGET_LINK_LIBRARIES(svcCnrHelper
# PRIVATE
# RTI::nddscpp2
@@ -30,6 +31,7 @@ NGL_TARGET_LINK_LIBRARIES(svcCnrHelper
# svcAesCommon
# ngldb
)
ENDIF(BUILD_RTI)
NGL_INSTALL_TARGET(svcCnrHelper)
#
@@ -67,6 +67,7 @@ NGL_TARGET_INCLUDE_DIRECTORIES(svcCmoClient
${CMAKE_CURRENT_BINARY_DIR}/../
)
IF(BUILD_RTI)
NGL_TARGET_LINK_LIBRARIES(svcCmoClient
PRIVATE
RTI::nddscpp2
@@ -76,6 +77,7 @@ NGL_TARGET_LINK_LIBRARIES(svcCmoClient
ddsftc
ngldb
)
ENDIF(BUILD_RTI)
NGL_INSTALL_TARGET(svcCmoClient)
#
@@ -94,6 +96,7 @@ NGL_TARGET_INCLUDE_DIRECTORIES(svcCmoServer
${CMAKE_CURRENT_BINARY_DIR}/../
)
IF(BUILD_RTI)
NGL_TARGET_LINK_LIBRARIES(svcCmoServer
PRIVATE
RTI::nddscpp2
@@ -103,6 +106,7 @@ NGL_TARGET_LINK_LIBRARIES(svcCmoServer
PUBLIC
svcCmoCommon
)
ENDIF(BUILD_RTI)
NGL_INSTALL_TARGET(svcCmoServer)
#
@@ -64,6 +64,7 @@ NGL_TARGET_INCLUDE_DIRECTORIES(svcGnaClient
${CMAKE_CURRENT_BINARY_DIR}/../
)
IF(BUILD_RTI)
NGL_TARGET_LINK_LIBRARIES(svcGnaClient
PRIVATE
RTI::nddscpp2
@@ -72,6 +73,7 @@ NGL_TARGET_LINK_LIBRARIES(svcGnaClient
svcGnaCommon
ddsftc
)
ENDIF(BUILD_RTI)
NGL_INSTALL_TARGET(svcGnaClient)
#
@@ -33,6 +33,7 @@ NGL_TARGET_INCLUDE_DIRECTORIES(HlaCommon
${CMAKE_CURRENT_SOURCE_DIR}/../
)
IF(BUILD_RTI)
NGL_TARGET_LINK_LIBRARIES(HlaCommon
LtsCoordTrans # ParticipantPosition
NGLLogger
@@ -46,6 +47,7 @@ NGL_TARGET_LINK_LIBRARIES(HlaCommon
# RTI::nddsc
# RTI::nddscpp2
)
ENDIF(BUILD_RTI)
#NGL_INSTALL(AAR SV FILES
# log4cxx_hla.props
@@ -120,6 +120,7 @@ NGL_TARGET_INCLUDE_DIRECTORIES(svcTabClient
${CMAKE_CURRENT_BINARY_DIR}/../
)
IF(BUILD_RTI)
NGL_TARGET_LINK_LIBRARIES(svcTabClient
PRIVATE
RTI::nddscpp2
@@ -128,6 +129,7 @@ NGL_TARGET_LINK_LIBRARIES(svcTabClient
svcTabCommon
ddsftc
)
ENDIF(BUILD_RTI)
NGL_INSTALL_TARGET(svcTabClient)
#
@@ -150,6 +152,7 @@ NGL_TARGET_INCLUDE_DIRECTORIES(svcTabServer
${CMAKE_CURRENT_BINARY_DIR}/../
)
IF(BUILD_RTI)
NGL_TARGET_LINK_LIBRARIES(svcTabServer
PRIVATE
RTI::nddscpp2
@@ -159,6 +162,7 @@ NGL_TARGET_LINK_LIBRARIES(svcTabServer
svcTabCommon
ngldb
)
ENDIF(BUILD_RTI)
NGL_INSTALL_TARGET(svcTabServer)
#
@@ -70,6 +70,7 @@ NGL_TARGET_INCLUDE_DIRECTORIES(svcTabocClient
${CMAKE_CURRENT_BINARY_DIR}/../
)
IF(BUILD_RTI)
NGL_TARGET_LINK_LIBRARIES(svcTabocClient
PRIVATE
RTI::nddscpp2
@@ -78,6 +79,7 @@ NGL_TARGET_LINK_LIBRARIES(svcTabocClient
svcTabocCommon
ddsftc
)
ENDIF(BUILD_RTI)
NGL_INSTALL_TARGET(svcTabocClient)
#
@@ -98,6 +100,7 @@ NGL_TARGET_INCLUDE_DIRECTORIES(svcTabocServer
${CMAKE_CURRENT_BINARY_DIR}/../
)
IF(BUILD_RTI)
NGL_TARGET_LINK_LIBRARIES(svcTabocServer
PRIVATE
RTI::nddscpp2
@@ -107,6 +110,7 @@ NGL_TARGET_LINK_LIBRARIES(svcTabocServer
ngldb
ddsfts
)
ENDIF(BUILD_RTI)
NGL_INSTALL_TARGET(svcTabocServer)
#