diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/CMakeLists.txt b/qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/CMakeLists.txt
index 1bb448016..815a3e9d9 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/CMakeLists.txt
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/CMakeLists.txt
@@ -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)
 
 #
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/CombatNetRadio/CMakeLists.txt b/qt6-after/qt6-migrated-legatus/Lts/Proxies/CombatNetRadio/CMakeLists.txt
index bf74a9ccb..460773383 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/CombatNetRadio/CMakeLists.txt
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/CombatNetRadio/CMakeLists.txt
@@ -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)
 
 #
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/ComponentMonitor/CMakeLists.txt b/qt6-after/qt6-migrated-legatus/Lts/Proxies/ComponentMonitor/CMakeLists.txt
index 20ad2c3b9..a55185d3e 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/ComponentMonitor/CMakeLists.txt
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/ComponentMonitor/CMakeLists.txt
@@ -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)
 
 #
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/GuezNasat/CMakeLists.txt b/qt6-after/qt6-migrated-legatus/Lts/Proxies/GuezNasat/CMakeLists.txt
index 237104635..4ba050e79 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/GuezNasat/CMakeLists.txt
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/GuezNasat/CMakeLists.txt
@@ -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)
 
 #
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Common/CMakeLists.txt b/qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Common/CMakeLists.txt
index 6715cfc34..e12b487a1 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Common/CMakeLists.txt
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Common/CMakeLists.txt
@@ -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
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/CMakeLists.txt b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/CMakeLists.txt
index 5fbc24d1e..12c67368d 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/CMakeLists.txt
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/CMakeLists.txt
@@ -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)
 
 #
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBaseOC/CMakeLists.txt b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBaseOC/CMakeLists.txt
index c6e2daf30..bbfd08bc4 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBaseOC/CMakeLists.txt
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBaseOC/CMakeLists.txt
@@ -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)
 
 #
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/AlarmManagement/CMakeLists.txt b/qt6-after/qt6-migrated-legatus/Lts/Services/AlarmManagement/CMakeLists.txt
index c0f62b75e..686263689 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/AlarmManagement/CMakeLists.txt
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/AlarmManagement/CMakeLists.txt
@@ -67,6 +67,7 @@ NGL_TARGET_INCLUDE_DIRECTORIES(svcAlmClient
     ${CMAKE_CURRENT_BINARY_DIR}/../
 )
 
+IF(BUILD_RTI)
 NGL_TARGET_LINK_LIBRARIES(svcAlmClient
   PRIVATE
     RTI::nddscpp2
@@ -76,6 +77,7 @@ NGL_TARGET_LINK_LIBRARIES(svcAlmClient
     ddsftc
 
 )
+ENDIF(BUILD_RTI)
 NGL_INSTALL_TARGET(svcAlmClient)
 
 #
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/CMakeLists.txt b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/CMakeLists.txt
index a592537e0..0b9b6bffa 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/CMakeLists.txt
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/CMakeLists.txt
@@ -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)
 
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/AssetManagement/CMakeLists.txt b/qt6-after/qt6-migrated-legatus/Lts/Services/AssetManagement/CMakeLists.txt
index b7630c0b5..74c5e6973 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/AssetManagement/CMakeLists.txt
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/AssetManagement/CMakeLists.txt
@@ -69,6 +69,7 @@ NGL_TARGET_INCLUDE_DIRECTORIES(svcAsmClient
     ${CMAKE_CURRENT_BINARY_DIR}/../
 )
 
+IF(BUILD_RTI)
 NGL_TARGET_LINK_LIBRARIES(svcAsmClient
   PRIVATE
     RTI::nddscpp2
@@ -77,6 +78,7 @@ NGL_TARGET_LINK_LIBRARIES(svcAsmClient
     svcAsmCommon
     ddsftc
 )
+ENDIF(BUILD_RTI)
 NGL_INSTALL_TARGET(svcAsmClient)
 
 #
@@ -96,6 +98,7 @@ NGL_TARGET_INCLUDE_DIRECTORIES(svcAsmServer
     ${CMAKE_CURRENT_BINARY_DIR}/../
 )
 
+IF(BUILD_RTI)
 NGL_TARGET_LINK_LIBRARIES(svcAsmServer
   PRIVATE
     RTI::nddscpp2
@@ -105,6 +108,7 @@ NGL_TARGET_LINK_LIBRARIES(svcAsmServer
     svcAsmCommon
     ngldb
 )
+ENDIF(BUILD_RTI)
 NGL_INSTALL_TARGET(svcAsmServer)
 
 #
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/CMakeLists.txt b/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/CMakeLists.txt
index 991220118..e69428873 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/CMakeLists.txt
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/CMakeLists.txt
@@ -172,6 +172,7 @@ NGL_TARGET_INCLUDE_DIRECTORIES(svcAvmClient
     ${CMAKE_CURRENT_BINARY_DIR}/../
 )
 
+IF(BUILD_RTI)
 NGL_TARGET_LINK_LIBRARIES(svcAvmClient
   PRIVATE
     RTI::nddscpp2
@@ -180,6 +181,7 @@ NGL_TARGET_LINK_LIBRARIES(svcAvmClient
     svcAvmCommon
     ddsftc
 )
+ENDIF(BUILD_RTI)
 NGL_INSTALL_TARGET(svcAvmClient)
 
 #
@@ -198,6 +200,7 @@ NGL_TARGET_INCLUDE_DIRECTORIES(svcAvmServer
     ${CMAKE_CURRENT_BINARY_DIR}/../
 )
 
+IF(BUILD_RTI)
 NGL_TARGET_LINK_LIBRARIES(svcAvmServer
   PRIVATE
     RTI::nddscpp2
@@ -207,6 +210,7 @@ NGL_TARGET_LINK_LIBRARIES(svcAvmServer
     svcAvmCommon
     ngldb
 )
+ENDIF(BUILD_RTI)
 NGL_INSTALL_TARGET(svcAvmServer)
 
 #
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/CMakeLists.txt b/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/CMakeLists.txt
index d241b974e..6a64b634d 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/CMakeLists.txt
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/CMakeLists.txt
@@ -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)
 
 #
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/GeoPairing/GeoPairingImpl/CMakeLists.txt b/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/GeoPairing/GeoPairingImpl/CMakeLists.txt
index 2509adf0b..bdc15d96b 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/GeoPairing/GeoPairingImpl/CMakeLists.txt
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/GeoPairing/GeoPairingImpl/CMakeLists.txt
@@ -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)
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/CodificationManagement/CMakeLists.txt b/qt6-after/qt6-migrated-legatus/Lts/Services/CodificationManagement/CMakeLists.txt
index d4b779f9e..59ece23d6 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/CodificationManagement/CMakeLists.txt
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/CodificationManagement/CMakeLists.txt
@@ -67,6 +67,7 @@ NGL_TARGET_INCLUDE_DIRECTORIES(svcCodClient
     ${CMAKE_CURRENT_BINARY_DIR}/../
 )
 
+IF(BUILD_RTI)
 NGL_TARGET_LINK_LIBRARIES(svcCodClient
   PRIVATE
     RTI::nddscpp2
@@ -75,6 +76,7 @@ NGL_TARGET_LINK_LIBRARIES(svcCodClient
     svcCodCommon
     ddsftc
 )
+ENDIF(BUILD_RTI)
 NGL_INSTALL_TARGET(svcCodClient)
 
 #
@@ -106,6 +108,7 @@ NGL_TARGET_INCLUDE_DIRECTORIES(svcCodServer
     ${CMAKE_CURRENT_BINARY_DIR}/../
 )
 
+IF(BUILD_RTI)
 NGL_TARGET_LINK_LIBRARIES(svcCodServer
   PRIVATE
     RTI::nddscpp2
@@ -122,6 +125,7 @@ NGL_TARGET_LINK_LIBRARIES(svcCodServer
     NGLLogger
     ngltools
 )
+ENDIF(BUILD_RTI)
 NGL_INSTALL_TARGET(svcCodServer)
 
 #
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowClient/CMakeLists.txt b/qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowClient/CMakeLists.txt
index ce694972c..1535c9ca6 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowClient/CMakeLists.txt
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowClient/CMakeLists.txt
@@ -68,6 +68,7 @@ NGL_TARGET_INCLUDE_DIRECTORIES(svcEscClient
     ${CMAKE_CURRENT_BINARY_DIR}/../
 )
 
+IF(BUILD_RTI)
 NGL_TARGET_LINK_LIBRARIES(svcEscClient
   PRIVATE
     RTI::nddscpp2
@@ -76,6 +77,7 @@ NGL_TARGET_LINK_LIBRARIES(svcEscClient
     svcEscCommon
     ddsftc
 )
+ENDIF(BUILD_RTI)
 NGL_INSTALL_TARGET(svcEscClient)
 
 #
@@ -94,6 +96,7 @@ NGL_TARGET_INCLUDE_DIRECTORIES(svcEscServer
     ${CMAKE_CURRENT_BINARY_DIR}/../
 )
 
+IF(BUILD_RTI)
 NGL_TARGET_LINK_LIBRARIES(svcEscServer
   PRIVATE
     RTI::nddscpp2
@@ -103,6 +106,7 @@ NGL_TARGET_LINK_LIBRARIES(svcEscServer
   PUBLIC
     svcEscCommon
 )
+ENDIF(BUILD_RTI)
 NGL_INSTALL_TARGET(svcEscServer)
 
 #
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowManagement/CMakeLists.txt b/qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowManagement/CMakeLists.txt
index b27ad7ce1..98a4cdba4 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowManagement/CMakeLists.txt
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowManagement/CMakeLists.txt
@@ -67,6 +67,7 @@ NGL_TARGET_INCLUDE_DIRECTORIES(svcEsmClient
     ${CMAKE_CURRENT_BINARY_DIR}/../
 )
 
+IF(BUILD_RTI)
 NGL_TARGET_LINK_LIBRARIES(svcEsmClient
   PRIVATE
     RTI::nddscpp2
@@ -75,6 +76,7 @@ NGL_TARGET_LINK_LIBRARIES(svcEsmClient
     svcEsmCommon
     ddsftc
 )
+ENDIF(BUILD_RTI)
 NGL_INSTALL_TARGET(svcEsmClient)
 
 #
@@ -138,6 +140,7 @@ NGL_TARGET_INCLUDE_DIRECTORIES(svcEsmServer
     ${CMAKE_CURRENT_BINARY_DIR}/../
 )
 
+IF(BUILD_RTI)
 NGL_TARGET_LINK_LIBRARIES(svcEsmServer
   PRIVATE
     RTI::nddscpp2
@@ -160,6 +163,7 @@ NGL_TARGET_LINK_LIBRARIES(svcEsmServer
     ddsconnector
     NGLLogger
 )
+ENDIF(BUILD_RTI)
 NGL_INSTALL_TARGET(svcEsmServer)
 
 #
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/Evaluations/CMakeLists.txt b/qt6-after/qt6-migrated-legatus/Lts/Services/Evaluations/CMakeLists.txt
index 57bb95f8a..af9971ad4 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/Evaluations/CMakeLists.txt
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/Evaluations/CMakeLists.txt
@@ -74,6 +74,7 @@ NGL_TARGET_INCLUDE_DIRECTORIES(svcEvlClient
     ${CMAKE_CURRENT_BINARY_DIR}/../
 )
 
+IF(BUILD_RTI)
 NGL_TARGET_LINK_LIBRARIES(svcEvlClient
   PRIVATE
     RTI::nddscpp2
@@ -82,6 +83,7 @@ NGL_TARGET_LINK_LIBRARIES(svcEvlClient
     svcEvlCommon
     ddsftc
 )
+ENDIF(BUILD_RTI)
 NGL_INSTALL_TARGET(svcEvlClient)
 
 #
@@ -130,6 +132,7 @@ NGL_TARGET_INCLUDE_DIRECTORIES(svcEvlServer
     ${CMAKE_CURRENT_BINARY_DIR}/../
 )
 
+IF(BUILD_RTI)
 NGL_TARGET_LINK_LIBRARIES(svcEvlServer
   PRIVATE
     RTI::nddscpp2
@@ -145,6 +148,7 @@ NGL_TARGET_LINK_LIBRARIES(svcEvlServer
     ngltools
     LtsCoordTrans
 )
+ENDIF(BUILD_RTI)
 NGL_INSTALL_TARGET(svcEvlServer)
 
 #
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/ExerciseEventManagement/CMakeLists.txt b/qt6-after/qt6-migrated-legatus/Lts/Services/ExerciseEventManagement/CMakeLists.txt
index d0067aedc..6f78f64db 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/ExerciseEventManagement/CMakeLists.txt
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/ExerciseEventManagement/CMakeLists.txt
@@ -72,6 +72,7 @@ NGL_TARGET_INCLUDE_DIRECTORIES(svcEemClient
     ${CMAKE_CURRENT_BINARY_DIR}/../
 )
 
+IF(BUILD_RTI)
 NGL_TARGET_LINK_LIBRARIES(svcEemClient
   PRIVATE
     RTI::nddscpp2
@@ -80,6 +81,7 @@ NGL_TARGET_LINK_LIBRARIES(svcEemClient
     svcEemCommon
     ddsftc
 )
+ENDIF(BUILD_RTI)
 NGL_INSTALL_TARGET(svcEemClient)
 
 #
@@ -98,6 +100,7 @@ NGL_TARGET_INCLUDE_DIRECTORIES(svcEemServer
     ${CMAKE_CURRENT_BINARY_DIR}/../
 )
 
+IF(BUILD_RTI)
 NGL_TARGET_LINK_LIBRARIES(svcEemServer
   PRIVATE
     RTI::nddscpp2
@@ -107,6 +110,7 @@ NGL_TARGET_LINK_LIBRARIES(svcEemServer
     svcEemCommon
     ngldb
 )
+ENDIF(BUILD_RTI)
 NGL_INSTALL_TARGET(svcEemServer)
 
 #
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/ExerciseManagement/CMakeLists.txt b/qt6-after/qt6-migrated-legatus/Lts/Services/ExerciseManagement/CMakeLists.txt
index e7cfa11c8..e9e9f8e28 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/ExerciseManagement/CMakeLists.txt
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/ExerciseManagement/CMakeLists.txt
@@ -68,6 +68,7 @@ NGL_TARGET_INCLUDE_DIRECTORIES(svcExmClient
     ${CMAKE_CURRENT_BINARY_DIR}/../
 )
 
+IF(BUILD_RTI)
 NGL_TARGET_LINK_LIBRARIES(svcExmClient
   PRIVATE
     RTI::nddscpp2
@@ -76,6 +77,7 @@ NGL_TARGET_LINK_LIBRARIES(svcExmClient
     svcExmCommon
     ddsftc
 )
+ENDIF(BUILD_RTI)
 NGL_INSTALL_TARGET(svcExmClient)
 
 #
@@ -95,6 +97,7 @@ NGL_TARGET_INCLUDE_DIRECTORIES(svcExmServer
     ${CMAKE_CURRENT_BINARY_DIR}/../
 )
 
+IF(BUILD_RTI)
 NGL_TARGET_LINK_LIBRARIES(svcExmServer
   PRIVATE
     RTI::nddscpp2
@@ -105,6 +108,7 @@ NGL_TARGET_LINK_LIBRARIES(svcExmServer
     svcExmCommon
     ngldb
 )
+ENDIF(BUILD_RTI)
 NGL_INSTALL_TARGET(svcExmServer)
 
 #
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/FileManagement/CMakeLists.txt b/qt6-after/qt6-migrated-legatus/Lts/Services/FileManagement/CMakeLists.txt
index 09d68ebe5..3232d6108 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/FileManagement/CMakeLists.txt
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/FileManagement/CMakeLists.txt
@@ -72,6 +72,7 @@ NGL_TARGET_INCLUDE_DIRECTORIES(svcFlmClient
     ${CMAKE_CURRENT_BINARY_DIR}/../
 )
 
+IF(BUILD_RTI)
 NGL_TARGET_LINK_LIBRARIES(svcFlmClient
   PRIVATE
     RTI::nddscpp2
@@ -80,6 +81,7 @@ NGL_TARGET_LINK_LIBRARIES(svcFlmClient
     svcFlmCommon
     ddsftc
 )
+ENDIF(BUILD_RTI)
 NGL_INSTALL_TARGET(svcFlmClient)
 
 #
@@ -100,6 +102,7 @@ NGL_TARGET_INCLUDE_DIRECTORIES(svcFlmServer
     ${CMAKE_CURRENT_BINARY_DIR}/../
 )
 
+IF(BUILD_RTI)
 NGL_TARGET_LINK_LIBRARIES(svcFlmServer
   PRIVATE
     RTI::nddscpp2
@@ -110,6 +113,7 @@ NGL_TARGET_LINK_LIBRARIES(svcFlmServer
     ngldb
     LtsUtilsCore
 )
+ENDIF(BUILD_RTI)
 NGL_INSTALL_TARGET(svcFlmServer)
 
 #
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/FilterManagement/CMakeLists.txt b/qt6-after/qt6-migrated-legatus/Lts/Services/FilterManagement/CMakeLists.txt
index 0bb7f124f..2cc8fd9ee 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/FilterManagement/CMakeLists.txt
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/FilterManagement/CMakeLists.txt
@@ -67,6 +67,7 @@ NGL_TARGET_INCLUDE_DIRECTORIES(svcFltClient
     ${CMAKE_CURRENT_BINARY_DIR}/../
 )
 
+IF(BUILD_RTI)
 NGL_TARGET_LINK_LIBRARIES(svcFltClient
   PRIVATE
     RTI::nddscpp2
@@ -75,6 +76,7 @@ NGL_TARGET_LINK_LIBRARIES(svcFltClient
     svcFltCommon
     ddsftc
 )
+ENDIF(BUILD_RTI)
 NGL_INSTALL_TARGET(svcFltClient)
 
 #
@@ -110,6 +112,7 @@ NGL_TARGET_INCLUDE_DIRECTORIES(svcFltServer
     ${CMAKE_CURRENT_BINARY_DIR}/../
 )
 
+IF(BUILD_RTI)
 NGL_TARGET_LINK_LIBRARIES(svcFltServer
   PRIVATE
     Qt6::Core
@@ -124,6 +127,7 @@ NGL_TARGET_LINK_LIBRARIES(svcFltServer
     svcFltCommon
     ngldb
 )
+ENDIF(BUILD_RTI)
 NGL_INSTALL_TARGET(svcFltServer)
 
 #
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/GuezIedManagement/CMakeLists.txt b/qt6-after/qt6-migrated-legatus/Lts/Services/GuezIedManagement/CMakeLists.txt
index 930a797eb..5a7f5641d 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/GuezIedManagement/CMakeLists.txt
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/GuezIedManagement/CMakeLists.txt
@@ -70,6 +70,7 @@ NGL_TARGET_INCLUDE_DIRECTORIES(svcGimClient
     ${CMAKE_CURRENT_BINARY_DIR}/../
 )
 
+IF(BUILD_RTI)
 NGL_TARGET_LINK_LIBRARIES(svcGimClient
   PRIVATE
     RTI::nddscpp2
@@ -78,6 +79,7 @@ NGL_TARGET_LINK_LIBRARIES(svcGimClient
     svcGimCommon
     ddsftc
 )
+ENDIF(BUILD_RTI)
 NGL_INSTALL_TARGET(svcGimClient)
 
 #
@@ -96,6 +98,7 @@ NGL_TARGET_INCLUDE_DIRECTORIES(svcGimServer
     ${CMAKE_CURRENT_BINARY_DIR}/../
 )
 
+IF(BUILD_RTI)
 NGL_TARGET_LINK_LIBRARIES(svcGimServer
   PRIVATE
     RTI::nddscpp2
@@ -105,6 +108,7 @@ NGL_TARGET_LINK_LIBRARIES(svcGimServer
     svcGimCommon
     ngldb
 )
+ENDIF(BUILD_RTI)
 NGL_INSTALL_TARGET(svcGimServer)
 
 #
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/InfrastructureManagement/CMakeLists.txt b/qt6-after/qt6-migrated-legatus/Lts/Services/InfrastructureManagement/CMakeLists.txt
index d0d87d956..4e130c0f9 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/InfrastructureManagement/CMakeLists.txt
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/InfrastructureManagement/CMakeLists.txt
@@ -75,6 +75,7 @@ NGL_TARGET_INCLUDE_DIRECTORIES(svcIsmClient
     ${CMAKE_CURRENT_BINARY_DIR}/../
 )
 
+IF(BUILD_RTI)
 NGL_TARGET_LINK_LIBRARIES(svcIsmClient
   PRIVATE
     RTI::nddscpp2
@@ -86,6 +87,7 @@ NGL_TARGET_LINK_LIBRARIES(svcIsmClient
     LtsCoordTrans
     Qt6::Gui
 )
+ENDIF(BUILD_RTI)
 NGL_INSTALL_TARGET(svcIsmClient)
 
 #
@@ -107,6 +109,7 @@ NGL_TARGET_INCLUDE_DIRECTORIES(svcIsmServer
     ${CMAKE_CURRENT_BINARY_DIR}/../
 )
 
+IF(BUILD_RTI)
 NGL_TARGET_LINK_LIBRARIES(svcIsmServer
   PRIVATE
     RTI::nddscpp2
@@ -118,6 +121,7 @@ NGL_TARGET_LINK_LIBRARIES(svcIsmServer
     LtsUtilsCore
     LtsWebSocketServer
 )
+ENDIF(BUILD_RTI)
 NGL_INSTALL_TARGET(svcIsmServer)
 
 #
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/InfrastructureManagement/ImportBuildings/CMakeLists.txt b/qt6-after/qt6-migrated-legatus/Lts/Services/InfrastructureManagement/ImportBuildings/CMakeLists.txt
index 061e21189..fac4a4d82 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/InfrastructureManagement/ImportBuildings/CMakeLists.txt
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/InfrastructureManagement/ImportBuildings/CMakeLists.txt
@@ -9,6 +9,7 @@ SET(SRCS_IMPORT_BUILDINGS
   ism_import_buildings.h
 )
 NGL_ADD_EXECUTABLE(AAR SV WS ismImportBuildings ${SRCS_IMPORT_BUILDINGS})
+IF(BUILD_RTI)
 NGL_TARGET_LINK_LIBRARIES(ismImportBuildings
   Qt6::Core
   RTI::nddscpp2
@@ -19,5 +20,6 @@ NGL_TARGET_LINK_LIBRARIES(ismImportBuildings
   LtsUtilsCoreHeaderOnly
   Qt6::WebSockets
 )
+ENDIF(BUILD_RTI)
 NGL_INSTALL_TARGET(ismImportBuildings)
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/MarkerManagement/CMakeLists.txt b/qt6-after/qt6-migrated-legatus/Lts/Services/MarkerManagement/CMakeLists.txt
index 2e566a5f1..2c9b69529 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/MarkerManagement/CMakeLists.txt
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/MarkerManagement/CMakeLists.txt
@@ -67,6 +67,7 @@ NGL_TARGET_INCLUDE_DIRECTORIES(svcMrkClient
     ${CMAKE_CURRENT_BINARY_DIR}/../
 )
 
+IF(BUILD_RTI)
 NGL_TARGET_LINK_LIBRARIES(svcMrkClient
   PRIVATE
     RTI::nddscpp2
@@ -75,6 +76,7 @@ NGL_TARGET_LINK_LIBRARIES(svcMrkClient
     svcMrkCommon
     ddsftc
 )
+ENDIF(BUILD_RTI)
 NGL_INSTALL_TARGET(svcMrkClient)
 
 #
@@ -110,6 +112,7 @@ NGL_TARGET_INCLUDE_DIRECTORIES(svcMrkServer
     ${CMAKE_CURRENT_BINARY_DIR}/../
 )
 
+IF(BUILD_RTI)
 NGL_TARGET_LINK_LIBRARIES(svcMrkServer
   PRIVATE
   Qt6::Core
@@ -125,6 +128,7 @@ NGL_TARGET_LINK_LIBRARIES(svcMrkServer
     svcMrkCommon
     ngldb
 )
+ENDIF(BUILD_RTI)
 NGL_INSTALL_TARGET(svcMrkServer)
 
 #
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/Messaging/CMakeLists.txt b/qt6-after/qt6-migrated-legatus/Lts/Services/Messaging/CMakeLists.txt
index b6776b824..8395ccd80 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/Messaging/CMakeLists.txt
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/Messaging/CMakeLists.txt
@@ -68,6 +68,7 @@ NGL_TARGET_INCLUDE_DIRECTORIES(svcMsgClient
     ${CMAKE_CURRENT_BINARY_DIR}/../
 )
 
+IF(BUILD_RTI)
 NGL_TARGET_LINK_LIBRARIES(svcMsgClient
   PRIVATE
     RTI::nddscpp2
@@ -76,6 +77,7 @@ NGL_TARGET_LINK_LIBRARIES(svcMsgClient
     svcMsgCommon
     ddsftc
 )
+ENDIF(BUILD_RTI)
 NGL_INSTALL_TARGET(svcMsgClient)
 
 #
@@ -94,6 +96,7 @@ NGL_TARGET_INCLUDE_DIRECTORIES(svcMsgServer
     ${CMAKE_CURRENT_BINARY_DIR}/../
 )
 
+IF(BUILD_RTI)
 NGL_TARGET_LINK_LIBRARIES(svcMsgServer
   PRIVATE
     RTI::nddscpp2
@@ -103,6 +106,7 @@ NGL_TARGET_LINK_LIBRARIES(svcMsgServer
     svcMsgCommon
     ngldb
 )
+ENDIF(BUILD_RTI)
 NGL_INSTALL_TARGET(svcMsgServer)
 
 #
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/MeteoDataManagement/CMakeLists.txt b/qt6-after/qt6-migrated-legatus/Lts/Services/MeteoDataManagement/CMakeLists.txt
index 86739786e..96e7bcc97 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/MeteoDataManagement/CMakeLists.txt
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/MeteoDataManagement/CMakeLists.txt
@@ -67,6 +67,7 @@ NGL_TARGET_INCLUDE_DIRECTORIES(svcMdmClient
     ${CMAKE_CURRENT_BINARY_DIR}/../
 )
 
+IF(BUILD_RTI)
 NGL_TARGET_LINK_LIBRARIES(svcMdmClient
   PRIVATE
     RTI::nddscpp2
@@ -75,6 +76,7 @@ NGL_TARGET_LINK_LIBRARIES(svcMdmClient
     svcMdmCommon
     ddsftc
 )
+ENDIF(BUILD_RTI)
 NGL_INSTALL_TARGET(svcMdmClient)
 
 #
@@ -93,6 +95,7 @@ NGL_TARGET_INCLUDE_DIRECTORIES(svcMdmServer
     ${CMAKE_CURRENT_BINARY_DIR}/../
 )
 
+IF(BUILD_RTI)
 NGL_TARGET_LINK_LIBRARIES(svcMdmServer
   PRIVATE
     RTI::nddscpp2
@@ -102,6 +105,7 @@ NGL_TARGET_LINK_LIBRARIES(svcMdmServer
     svcMdmCommon
     ngldb
 )
+ENDIF(BUILD_RTI)
 NGL_INSTALL_TARGET(svcMdmServer)
 
 #
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/NmeaManagement/CMakeLists.txt b/qt6-after/qt6-migrated-legatus/Lts/Services/NmeaManagement/CMakeLists.txt
index af6c48b23..60c413008 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/NmeaManagement/CMakeLists.txt
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/NmeaManagement/CMakeLists.txt
@@ -64,6 +64,7 @@ NGL_TARGET_INCLUDE_DIRECTORIES(svcNmeClient
     ${CMAKE_CURRENT_BINARY_DIR}/../
 )
 
+IF(BUILD_RTI)
 NGL_TARGET_LINK_LIBRARIES(svcNmeClient
   PRIVATE
     RTI::nddscpp2
@@ -72,6 +73,7 @@ NGL_TARGET_LINK_LIBRARIES(svcNmeClient
     svcNmeCommon
     ddsftc
 )
+ENDIF(BUILD_RTI)
 NGL_INSTALL_TARGET(svcNmeClient)
 
 #
@@ -92,6 +94,7 @@ NGL_TARGET_INCLUDE_DIRECTORIES(svcNmeServer
     ${CMAKE_CURRENT_BINARY_DIR}/../
 )
 
+IF(BUILD_RTI)
 NGL_TARGET_LINK_LIBRARIES(svcNmeServer
   PRIVATE
     RTI::nddscpp2
@@ -101,6 +104,7 @@ NGL_TARGET_LINK_LIBRARIES(svcNmeServer
   PUBLIC
     svcNmeCommon
 )
+ENDIF(BUILD_RTI)
 NGL_INSTALL_TARGET(svcNmeServer)
 
 #
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/NotificationManagement/CMakeLists.txt b/qt6-after/qt6-migrated-legatus/Lts/Services/NotificationManagement/CMakeLists.txt
index 35246af36..1ccadfc41 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/NotificationManagement/CMakeLists.txt
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/NotificationManagement/CMakeLists.txt
@@ -68,6 +68,7 @@ NGL_TARGET_INCLUDE_DIRECTORIES(svcNomClient
     ${CMAKE_CURRENT_BINARY_DIR}/../
 )
 
+IF(BUILD_RTI)
 NGL_TARGET_LINK_LIBRARIES(svcNomClient
   PRIVATE
     RTI::nddscpp2
@@ -76,6 +77,7 @@ NGL_TARGET_LINK_LIBRARIES(svcNomClient
     svcNomCommon
     ddsftc
 )
+ENDIF(BUILD_RTI)
 NGL_INSTALL_TARGET(svcNomClient)
 
 #
@@ -94,6 +96,7 @@ NGL_TARGET_INCLUDE_DIRECTORIES(svcNomServer
     ${CMAKE_CURRENT_BINARY_DIR}/../
 )
 
+IF(BUILD_RTI)
 NGL_TARGET_LINK_LIBRARIES(svcNomServer
   PRIVATE
     RTI::nddscpp2
@@ -103,6 +106,7 @@ NGL_TARGET_LINK_LIBRARIES(svcNomServer
     svcNomCommon
     ngldb
 )
+ENDIF(BUILD_RTI)
 NGL_INSTALL_TARGET(svcNomServer)
 
 #
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/OcBaseDownload/CMakeLists.txt b/qt6-after/qt6-migrated-legatus/Lts/Services/OcBaseDownload/CMakeLists.txt
index 98766c203..c7c0b7ecd 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/OcBaseDownload/CMakeLists.txt
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/OcBaseDownload/CMakeLists.txt
@@ -67,6 +67,7 @@ NGL_TARGET_INCLUDE_DIRECTORIES(svcObdClient
     ${CMAKE_CURRENT_BINARY_DIR}/../
 )
 
+IF(BUILD_RTI)
 NGL_TARGET_LINK_LIBRARIES(svcObdClient
   PRIVATE
     RTI::nddscpp2
@@ -75,6 +76,7 @@ NGL_TARGET_LINK_LIBRARIES(svcObdClient
     svcObdCommon
     ddsftc
 )
+ENDIF(BUILD_RTI)
 NGL_INSTALL_TARGET(svcObdClient)
 
 #
@@ -93,6 +95,7 @@ NGL_TARGET_INCLUDE_DIRECTORIES(svcObdServer
     ${CMAKE_CURRENT_BINARY_DIR}/../
 )
 
+IF(BUILD_RTI)
 NGL_TARGET_LINK_LIBRARIES(svcObdServer
   PRIVATE
     RTI::nddscpp2
@@ -102,6 +105,7 @@ NGL_TARGET_LINK_LIBRARIES(svcObdServer
     svcObdCommon
     ngldb
 )
+ENDIF(BUILD_RTI)
 NGL_INSTALL_TARGET(svcObdServer)
 
 #
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/OcSituationClient/CMakeLists.txt b/qt6-after/qt6-migrated-legatus/Lts/Services/OcSituationClient/CMakeLists.txt
index 5698eb6e2..ea9a717fd 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/OcSituationClient/CMakeLists.txt
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/OcSituationClient/CMakeLists.txt
@@ -80,6 +80,7 @@ NGL_TARGET_INCLUDE_DIRECTORIES(svcOscClient
     ${CMAKE_CURRENT_BINARY_DIR}/../
 )
 
+IF(BUILD_RTI)
 NGL_TARGET_LINK_LIBRARIES(svcOscClient
   PRIVATE
     RTI::nddscpp2
@@ -88,6 +89,7 @@ NGL_TARGET_LINK_LIBRARIES(svcOscClient
     svcOscCommon
     ddsftc
 )
+ENDIF(BUILD_RTI)
 NGL_INSTALL_TARGET(svcOscClient)
 
 #
@@ -106,6 +108,7 @@ NGL_TARGET_INCLUDE_DIRECTORIES(svcOscServer
     ${CMAKE_CURRENT_BINARY_DIR}/../
 )
 
+IF(BUILD_RTI)
 NGL_TARGET_LINK_LIBRARIES(svcOscServer
   PRIVATE
     RTI::nddscpp2
@@ -115,6 +118,7 @@ NGL_TARGET_LINK_LIBRARIES(svcOscServer
     svcOscCommon
     ngldb
 )
+ENDIF(BUILD_RTI)
 NGL_INSTALL_TARGET(svcOscServer)
 
 #
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/OcSituationServer/CMakeLists.txt b/qt6-after/qt6-migrated-legatus/Lts/Services/OcSituationServer/CMakeLists.txt
index bee43343b..38a32293e 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/OcSituationServer/CMakeLists.txt
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/OcSituationServer/CMakeLists.txt
@@ -83,6 +83,7 @@ NGL_TARGET_INCLUDE_DIRECTORIES(svcOssClient
     ${CMAKE_CURRENT_BINARY_DIR}/../
 )
 
+IF(BUILD_RTI)
 NGL_TARGET_LINK_LIBRARIES(svcOssClient
   PRIVATE
     RTI::nddscpp2
@@ -91,6 +92,7 @@ NGL_TARGET_LINK_LIBRARIES(svcOssClient
     svcOssCommon
     ddsftc
 )
+ENDIF(BUILD_RTI)
 NGL_INSTALL_TARGET(svcOssClient)
 
 #
@@ -109,6 +111,7 @@ NGL_TARGET_INCLUDE_DIRECTORIES(svcOssServer
     ${CMAKE_CURRENT_BINARY_DIR}/../
 )
 
+IF(BUILD_RTI)
 NGL_TARGET_LINK_LIBRARIES(svcOssServer
   PRIVATE
     RTI::nddscpp2
@@ -118,6 +121,7 @@ NGL_TARGET_LINK_LIBRARIES(svcOssServer
     svcOssCommon
     ngldb
 )
+ENDIF(BUILD_RTI)
 NGL_INSTALL_TARGET(svcOssServer)
 
 #
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/OperatorManagement/CMakeLists.txt b/qt6-after/qt6-migrated-legatus/Lts/Services/OperatorManagement/CMakeLists.txt
index 44722d3be..aec6e196e 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/OperatorManagement/CMakeLists.txt
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/OperatorManagement/CMakeLists.txt
@@ -70,6 +70,7 @@ NGL_TARGET_INCLUDE_DIRECTORIES(svcOpmClient
     ${CMAKE_CURRENT_BINARY_DIR}/../
 )
 
+IF(BUILD_RTI)
 NGL_TARGET_LINK_LIBRARIES(svcOpmClient
   PRIVATE
     RTI::nddscpp2
@@ -78,6 +79,7 @@ NGL_TARGET_LINK_LIBRARIES(svcOpmClient
     svcOpmCommon
     ddsftc
 )
+ENDIF(BUILD_RTI)
 NGL_INSTALL_TARGET(svcOpmClient)
 
 #
@@ -96,6 +98,7 @@ NGL_TARGET_INCLUDE_DIRECTORIES(svcOpmServer
     ${CMAKE_CURRENT_BINARY_DIR}/../
 )
 
+IF(BUILD_RTI)
 NGL_TARGET_LINK_LIBRARIES(svcOpmServer
   PRIVATE
     RTI::nddscpp2
@@ -106,6 +109,7 @@ NGL_TARGET_LINK_LIBRARIES(svcOpmServer
     ngldb
     LtsUtilsCore
 )
+ENDIF(BUILD_RTI)
 NGL_INSTALL_TARGET(svcOpmServer)
 
 #
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/ParticipantManagement/CMakeLists.txt b/qt6-after/qt6-migrated-legatus/Lts/Services/ParticipantManagement/CMakeLists.txt
index 15da04676..da346d0e9 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/ParticipantManagement/CMakeLists.txt
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/ParticipantManagement/CMakeLists.txt
@@ -80,6 +80,7 @@ NGL_TARGET_INCLUDE_DIRECTORIES(svcPpmClient
     ${CMAKE_CURRENT_BINARY_DIR}/../
 )
 
+IF(BUILD_RTI)
 NGL_TARGET_LINK_LIBRARIES(svcPpmClient
   PRIVATE
     RTI::nddscpp2
@@ -88,6 +89,7 @@ NGL_TARGET_LINK_LIBRARIES(svcPpmClient
     svcPpmCommon
     ddsftc
 )
+ENDIF(BUILD_RTI)
 NGL_INSTALL_TARGET(svcPpmClient)
 
 #
@@ -109,6 +111,7 @@ NGL_TARGET_INCLUDE_DIRECTORIES(svcPpmServer
     ${CMAKE_CURRENT_BINARY_DIR}/../
 )
 
+IF(BUILD_RTI)
 NGL_TARGET_LINK_LIBRARIES(svcPpmServer
   PRIVATE
     RTI::nddscpp2
@@ -119,6 +122,7 @@ NGL_TARGET_LINK_LIBRARIES(svcPpmServer
     ngldb
     LtsUtilsCore
 )
+ENDIF(BUILD_RTI)
 NGL_INSTALL_TARGET(svcPpmServer)
 
 #
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/PresentationManagement/CMakeLists.txt b/qt6-after/qt6-migrated-legatus/Lts/Services/PresentationManagement/CMakeLists.txt
index 7c7f27c3f..9d09e2c82 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/PresentationManagement/CMakeLists.txt
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/PresentationManagement/CMakeLists.txt
@@ -67,6 +67,7 @@ NGL_TARGET_INCLUDE_DIRECTORIES(svcPreClient
     ${CMAKE_CURRENT_BINARY_DIR}/../
 )
 
+IF(BUILD_RTI)
 NGL_TARGET_LINK_LIBRARIES(svcPreClient
   PRIVATE
     RTI::nddscpp2
@@ -75,6 +76,7 @@ NGL_TARGET_LINK_LIBRARIES(svcPreClient
     svcPreCommon
     ddsftc
 )
+ENDIF(BUILD_RTI)
 NGL_INSTALL_TARGET(svcPreClient)
 
 #
@@ -105,6 +107,7 @@ NGL_TARGET_INCLUDE_DIRECTORIES(svcPreServer
     ${CMAKE_CURRENT_BINARY_DIR}/../
 )
 
+IF(BUILD_RTI)
 NGL_TARGET_LINK_LIBRARIES(svcPreServer
   PRIVATE
     RTI::nddscpp2
@@ -117,6 +120,7 @@ NGL_TARGET_LINK_LIBRARIES(svcPreServer
     svcPreCommon
     ngldb
 )
+ENDIF(BUILD_RTI)
 NGL_INSTALL_TARGET(svcPreServer)
 
 #
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/ReportManagement/CMakeLists.txt b/qt6-after/qt6-migrated-legatus/Lts/Services/ReportManagement/CMakeLists.txt
index 54e292afe..e4b665cf0 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/ReportManagement/CMakeLists.txt
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/ReportManagement/CMakeLists.txt
@@ -67,6 +67,7 @@ NGL_TARGET_INCLUDE_DIRECTORIES(svcRepClient
     ${CMAKE_CURRENT_BINARY_DIR}/../
 )
 
+IF(BUILD_RTI)
 NGL_TARGET_LINK_LIBRARIES(svcRepClient
   PRIVATE
     RTI::nddscpp2
@@ -75,6 +76,7 @@ NGL_TARGET_LINK_LIBRARIES(svcRepClient
     svcRepCommon
     ddsftc
 )
+ENDIF(BUILD_RTI)
 NGL_INSTALL_TARGET(svcRepClient)
 
 #
@@ -93,6 +95,7 @@ NGL_TARGET_INCLUDE_DIRECTORIES(svcRepServer
     ${CMAKE_CURRENT_BINARY_DIR}/../
 )
 
+IF(BUILD_RTI)
 NGL_TARGET_LINK_LIBRARIES(svcRepServer
   PRIVATE
     RTI::nddscpp2
@@ -102,6 +105,7 @@ NGL_TARGET_LINK_LIBRARIES(svcRepServer
     svcRepCommon
     ngldb
 )
+ENDIF(BUILD_RTI)
 NGL_INSTALL_TARGET(svcRepServer)
 
 #
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/ServiceManagement/CMakeLists.txt b/qt6-after/qt6-migrated-legatus/Lts/Services/ServiceManagement/CMakeLists.txt
index af18f7973..f9d088430 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/ServiceManagement/CMakeLists.txt
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/ServiceManagement/CMakeLists.txt
@@ -67,6 +67,7 @@ NGL_TARGET_INCLUDE_DIRECTORIES(svcScmClient
     ${CMAKE_CURRENT_BINARY_DIR}/../
 )
 
+IF(BUILD_RTI)
 NGL_TARGET_LINK_LIBRARIES(svcScmClient
   PRIVATE
     RTI::nddscpp2
@@ -75,6 +76,7 @@ NGL_TARGET_LINK_LIBRARIES(svcScmClient
     svcScmCommon
     ddsftc
 )
+ENDIF(BUILD_RTI)
 NGL_INSTALL_TARGET(svcScmClient)
 
 #
@@ -93,6 +95,7 @@ NGL_TARGET_INCLUDE_DIRECTORIES(svcScmServer
     ${CMAKE_CURRENT_BINARY_DIR}/../
 )
 
+IF(BUILD_RTI)
 NGL_TARGET_LINK_LIBRARIES(svcScmServer
   PRIVATE
     RTI::nddscpp2
@@ -102,6 +105,7 @@ NGL_TARGET_LINK_LIBRARIES(svcScmServer
     svcScmCommon
     ngldb
 )
+ENDIF(BUILD_RTI)
 NGL_INSTALL_TARGET(svcScmServer)
 
 #
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/SituationReplay/CMakeLists.txt b/qt6-after/qt6-migrated-legatus/Lts/Services/SituationReplay/CMakeLists.txt
index a23495405..30c034d70 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/SituationReplay/CMakeLists.txt
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/SituationReplay/CMakeLists.txt
@@ -68,6 +68,7 @@ NGL_TARGET_INCLUDE_DIRECTORIES(svcSrpClient
     ${CMAKE_CURRENT_BINARY_DIR}/../
 )
 
+IF(BUILD_RTI)
 NGL_TARGET_LINK_LIBRARIES(svcSrpClient
   PRIVATE
     RTI::nddscpp2
@@ -76,6 +77,7 @@ NGL_TARGET_LINK_LIBRARIES(svcSrpClient
     svcSrpCommon
     ddsftc
 )
+ENDIF(BUILD_RTI)
 NGL_INSTALL_TARGET(svcSrpClient)
 
 #
@@ -94,6 +96,7 @@ NGL_TARGET_INCLUDE_DIRECTORIES(svcSrpServer
     ${CMAKE_CURRENT_BINARY_DIR}/../
 )
 
+IF(BUILD_RTI)
 NGL_TARGET_LINK_LIBRARIES(svcSrpServer
   PRIVATE
     RTI::nddscpp2
@@ -103,6 +106,7 @@ NGL_TARGET_LINK_LIBRARIES(svcSrpServer
     svcSrpCommon
     ngldb
 )
+ENDIF(BUILD_RTI)
 NGL_INSTALL_TARGET(svcSrpServer)
 
 #
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/SoundManagement/CMakeLists.txt b/qt6-after/qt6-migrated-legatus/Lts/Services/SoundManagement/CMakeLists.txt
index 5bad7126b..694ae6eb2 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/SoundManagement/CMakeLists.txt
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/SoundManagement/CMakeLists.txt
@@ -67,6 +67,7 @@ NGL_TARGET_INCLUDE_DIRECTORIES(svcSomClient
     ${CMAKE_CURRENT_BINARY_DIR}/../
 )
 
+IF(BUILD_RTI)
 NGL_TARGET_LINK_LIBRARIES(svcSomClient
   PRIVATE
     RTI::nddscpp2
@@ -75,6 +76,7 @@ NGL_TARGET_LINK_LIBRARIES(svcSomClient
     svcSomCommon
     ddsftc
 )
+ENDIF(BUILD_RTI)
 NGL_INSTALL_TARGET(svcSomClient)
 
 #
@@ -94,6 +96,7 @@ NGL_TARGET_INCLUDE_DIRECTORIES(svcSomServer
     ${CMAKE_CURRENT_BINARY_DIR}/../
 )
 
+IF(BUILD_RTI)
 NGL_TARGET_LINK_LIBRARIES(svcSomServer
   PRIVATE
     RTI::nddscpp2
@@ -103,6 +106,7 @@ NGL_TARGET_LINK_LIBRARIES(svcSomServer
   PUBLIC
     svcSomCommon
 )
+ENDIF(BUILD_RTI)
 NGL_INSTALL_TARGET(svcSomServer)
 
 #
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/TargetManagement/CMakeLists.txt b/qt6-after/qt6-migrated-legatus/Lts/Services/TargetManagement/CMakeLists.txt
index 6dda1ba58..6cc9e7ee1 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/TargetManagement/CMakeLists.txt
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/TargetManagement/CMakeLists.txt
@@ -67,6 +67,7 @@ NGL_TARGET_INCLUDE_DIRECTORIES(svcTgtClient
     ${CMAKE_CURRENT_BINARY_DIR}/../
 )
 
+IF(BUILD_RTI)
 NGL_TARGET_LINK_LIBRARIES(svcTgtClient
   PRIVATE
     RTI::nddscpp2
@@ -75,6 +76,7 @@ NGL_TARGET_LINK_LIBRARIES(svcTgtClient
     svcTgtCommon
     ddsftc
 )
+ENDIF(BUILD_RTI)
 NGL_INSTALL_TARGET(svcTgtClient)
 
 #
@@ -94,6 +96,7 @@ NGL_TARGET_INCLUDE_DIRECTORIES(svcTgtServer
     ${CMAKE_CURRENT_BINARY_DIR}/../
 )
 
+IF(BUILD_RTI)
 NGL_TARGET_LINK_LIBRARIES(svcTgtServer
   PRIVATE
     RTI::nddscpp2
@@ -103,6 +106,7 @@ NGL_TARGET_LINK_LIBRARIES(svcTgtServer
   PUBLIC
     svcTgtCommon
 )
+ENDIF(BUILD_RTI)
 NGL_INSTALL_TARGET(svcTgtServer)
 
 #
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/WarehouseGuez/CMakeLists.txt b/qt6-after/qt6-migrated-legatus/Lts/Services/WarehouseGuez/CMakeLists.txt
index eceff723e..604beb7e7 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/WarehouseGuez/CMakeLists.txt
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/WarehouseGuez/CMakeLists.txt
@@ -67,6 +67,7 @@ NGL_TARGET_INCLUDE_DIRECTORIES(svcWhgClient
     ${CMAKE_CURRENT_BINARY_DIR}/../
 )
 
+IF(BUILD_RTI)
 NGL_TARGET_LINK_LIBRARIES(svcWhgClient
   PRIVATE
     RTI::nddscpp2
@@ -75,6 +76,7 @@ NGL_TARGET_LINK_LIBRARIES(svcWhgClient
     svcWhgCommon
     ddsftc
 )
+ENDIF(BUILD_RTI)
 NGL_INSTALL_TARGET(svcWhgClient)
 
 #
@@ -93,6 +95,7 @@ NGL_TARGET_INCLUDE_DIRECTORIES(svcWhgServer
     ${CMAKE_CURRENT_BINARY_DIR}/../
 )
 
+IF(BUILD_RTI)
 NGL_TARGET_LINK_LIBRARIES(svcWhgServer
   PRIVATE
     RTI::nddscpp2
@@ -102,6 +105,7 @@ NGL_TARGET_LINK_LIBRARIES(svcWhgServer
     svcWhgCommon
     ngldb
 )
+ENDIF(BUILD_RTI)
 NGL_INSTALL_TARGET(svcWhgServer)
 
 #
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/skeleton/base/CMakeLists.txt b/qt6-after/qt6-migrated-legatus/Lts/Services/skeleton/base/CMakeLists.txt
index 892d1c7bd..78bef4ccd 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/skeleton/base/CMakeLists.txt
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/skeleton/base/CMakeLists.txt
@@ -64,6 +64,7 @@ NGL_TARGET_INCLUDE_DIRECTORIES(svcXxxClient
     ${CMAKE_CURRENT_BINARY_DIR}/../
 )
 
+IF(BUILD_RTI)
 NGL_TARGET_LINK_LIBRARIES(svcXxxClient
   PRIVATE
     RTI::nddscpp2
@@ -72,6 +73,7 @@ NGL_TARGET_LINK_LIBRARIES(svcXxxClient
     svcXxxCommon
     ddsftc
 )
+ENDIF(BUILD_RTI)
 NGL_INSTALL_TARGET(svcXxxClient)
 
 #
@@ -92,6 +94,7 @@ NGL_TARGET_INCLUDE_DIRECTORIES(svcXxxServer
     ${CMAKE_CURRENT_BINARY_DIR}/../
 )
 
+IF(BUILD_RTI)
 NGL_TARGET_LINK_LIBRARIES(svcXxxServer
   PRIVATE
     RTI::nddscpp2
@@ -101,6 +104,7 @@ NGL_TARGET_LINK_LIBRARIES(svcXxxServer
   PUBLIC
     svcXxxCommon
 )
+ENDIF(BUILD_RTI)
 NGL_INSTALL_TARGET(svcXxxServer)
 
 #