diff --git a/qt6-after/qt6-migrated-legatus/CMakeLists.txt b/qt6-after/qt6-migrated-legatus/CMakeLists.txt
index 5e476c9b8..9c4aa9bd1 100755
--- a/qt6-after/qt6-migrated-legatus/CMakeLists.txt
+++ b/qt6-after/qt6-migrated-legatus/CMakeLists.txt
@@ -88,6 +88,8 @@ CONFIGURE_FILE(CTestCustom.ctest ${CMAKE_BINARY_DIR}/CTestCustom.ctest COPYONLY)
 CONFIGURE_FILE(lts-cc.conf ${CMAKE_BINARY_DIR}/lts-cc.conf.distrib COPYONLY)
 
 SET(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake")
+# Add bundled GeographicLib cmake config to find modern targets (GeographicLib::GeographicLib_SHARED)
+LIST(APPEND CMAKE_PREFIX_PATH "${CMAKE_SOURCE_DIR}/include/GeographicLib/lib/cmake")
 SET(EXECUTABLE_OUTPUT_PATH ${CMAKE_BINARY_DIR}/bin)
 IF(WIN32)
   SET(LIBRARY_OUTPUT_PATH ${CMAKE_BINARY_DIR}/bin)
@@ -308,6 +310,16 @@ OPTION(BUILD_TOOLSWS "Build TOOLSWS component" ON)
 OPTION(BUILD_TOOLSSV "Build TOOLSSV component" ON)
 OPTION(BUILD_HLA "Build HLA component" ON)
 
+# If BUILD_ALL is ON, enable all individual component flags
+IF(BUILD_ALL)
+  SET(BUILD_SV ON CACHE BOOL "Build SV component" FORCE)
+  SET(BUILD_WS ON CACHE BOOL "Build WS component" FORCE)
+  SET(BUILD_AAR ON CACHE BOOL "Build AAR component" FORCE)
+  SET(BUILD_TOOLSWS ON CACHE BOOL "Build TOOLSWS component" FORCE)
+  SET(BUILD_TOOLSSV ON CACHE BOOL "Build TOOLSSV component" FORCE)
+  SET(BUILD_HLA ON CACHE BOOL "Build HLA component" FORCE)
+ENDIF()
+
 IF(BUILD_RPM)
   ADD_SUBDIRECTORY(scripts)
 ELSE()
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsAppManager/CMakeLists.txt b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsAppManager/CMakeLists.txt
index 0c8ae5915..7f75f9b8d 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsAppManager/CMakeLists.txt
+++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsAppManager/CMakeLists.txt
@@ -20,6 +20,7 @@ NGL_WRAP_UI(LtsAppManager_SRCS
   AppChooser/CustomViews/app.ui
 )
 
+IF(BUILD_RTI)
 NGL_ADD_LIBRARY(WS LtsAppManager SHARED ${LtsAppManager_SRCS})
 NGL_TARGET_INCLUDE_DIRECTORIES(LtsAppManager
   PUBLIC
@@ -50,3 +51,4 @@ NGL_TARGET_LINK_LIBRARIES(LtsAppManager
 )
 
 NGL_INSTALL_TARGET(LtsAppManager)
+ENDIF(BUILD_RTI)
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsCoordTrans/CMakeLists.txt b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsCoordTrans/CMakeLists.txt
index ee0644805..35e03b8d5 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsCoordTrans/CMakeLists.txt
+++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsCoordTrans/CMakeLists.txt
@@ -47,6 +47,7 @@ NGL_TARGET_LINK_LIBRARIES(ltsCoordWidget
 NGL_TARGET_INCLUDE_DIRECTORIES(ltsCoordWidget
   PUBLIC
     ${CMAKE_CURRENT_SOURCE_DIR}/../
+    ${CMAKE_CURRENT_SOURCE_DIR}/../LtsUtils/LtsUtilsCore
 )
 
 IF(TARGET LtsCoordTrans)
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsCoordTrans/lts_coord_widget_p.cpp b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsCoordTrans/lts_coord_widget_p.cpp
index 9e850e961..a4b890911 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsCoordTrans/lts_coord_widget_p.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsCoordTrans/lts_coord_widget_p.cpp
@@ -40,7 +40,7 @@ MgrsEdit::MgrsEdit(int precision, QWidget *widget)
   m_ui->leNorth->setValidator(new QIntValidator(0, upperLimit, m_ui->leNorth));
   setDefaultMgrsSquares();
 
-  connect(m_ui->cbxZone, QOverload<const QString &>::of(&QComboBox::currentIndexChanged),
+  connect(m_ui->cbxZone, QOverload<int>::of(&QComboBox::currentIndexChanged),
           this, &MgrsEdit::onCoordinateDataChanged);
   connect(m_ui->leEast, &QLineEdit::editingFinished,
           this, &MgrsEdit::onCoordinateDataChanged);
@@ -314,7 +314,7 @@ QValidator::State DoubleValidator::validate(QString &input, int &pos) const
   if (ret != QValidator::Acceptable)
     return ret;
   QLocale l;
-  const QChar gs(l.groupSeparator());
+  const QChar gs = l.groupSeparator().at(0);
   if (gs.isNull())
     return ret;
   if (input.contains(gs))
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsCoordinate/CMakeLists.txt b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsCoordinate/CMakeLists.txt
index 0595bd806..33e2d2e8c 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsCoordinate/CMakeLists.txt
+++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsCoordinate/CMakeLists.txt
@@ -14,6 +14,7 @@ NGL_TARGET_INCLUDE_DIRECTORIES(LtsCoordinate
   INTERFACE
     ${CMAKE_CURRENT_SOURCE_DIR}/../
 )
+IF(BUILD_RTI)
 NGL_TARGET_LINK_LIBRARIES(LtsCoordinate
   PRIVATE
     LtsCoordTrans
@@ -22,5 +23,6 @@ NGL_TARGET_LINK_LIBRARIES(LtsCoordinate
     LtsUtilsCoreHeaderOnly
     Qt6::Core
 )
+ENDIF(BUILD_RTI)
 
 ADD_SUBDIRECTORY(UnitTest_Coordinate)
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsLogin/CMakeLists.txt b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsLogin/CMakeLists.txt
index 44dda0727..e4ffa8cab 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsLogin/CMakeLists.txt
+++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsLogin/CMakeLists.txt
@@ -19,6 +19,7 @@ NGL_WRAP_UI(LtsLogin_SRCS
   logout_info_dialog.ui
 )
 
+IF(BUILD_RTI)
 NGL_ADD_LIBRARY2(WS LtsLogin SHARED ${LtsLogin_SRCS})
 NGL_TARGET_INCLUDE_DIRECTORIES(LtsLogin
   PUBLIC
@@ -40,3 +41,4 @@ NGL_TARGET_LINK_LIBRARIES(LtsLogin
     AsmDataPluginInterface
     Qt6::Core
 )
+ENDIF(BUILD_RTI)
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsMultiMonitor/CMakeLists.txt b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsMultiMonitor/CMakeLists.txt
index c0b9a5b32..9dd4661c5 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsMultiMonitor/CMakeLists.txt
+++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsMultiMonitor/CMakeLists.txt
@@ -27,6 +27,7 @@ SET(LtsMultiMonitor_SRCS
   lts_screen_wide.cpp
 )
 
+IF(BUILD_RTI)
 NGL_ADD_LIBRARY(WS LtsMultiMonitor SHARED ${LtsMultiMonitor_SRCS})
 
 NGL_TARGET_INCLUDE_DIRECTORIES(LtsMultiMonitor
@@ -47,3 +48,4 @@ NGL_TARGET_LINK_LIBRARIES(LtsMultiMonitor
 )
 
 NGL_INSTALL_TARGET(LtsMultiMonitor)
+ENDIF(BUILD_RTI)
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsMultiMonitor/lts_multi_monitor_selector_base.cpp b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsMultiMonitor/lts_multi_monitor_selector_base.cpp
index 382ade6f8..8cb65fbe1 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsMultiMonitor/lts_multi_monitor_selector_base.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsMultiMonitor/lts_multi_monitor_selector_base.cpp
@@ -283,7 +283,6 @@ void MultiMonitorSelectorBase::drawBase(QPainter &p, bool drawSelector, bool occ
   
   p.save();
   p.setRenderHint(QPainter::Antialiasing, true);
-  p.setRenderHint(QPainter::HighQualityAntialiasing, true);
 
 
   
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsMultiMonitor/lts_multi_monitor_selector_wide.cpp b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsMultiMonitor/lts_multi_monitor_selector_wide.cpp
index 3f514d624..54e7f100b 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsMultiMonitor/lts_multi_monitor_selector_wide.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsMultiMonitor/lts_multi_monitor_selector_wide.cpp
@@ -242,7 +242,6 @@ void MultiMonitorSelectorWide::paintEvent(QPaintEvent *)
   p.save();
 
   p.setRenderHint(QPainter::Antialiasing, true);
-  p.setRenderHint(QPainter::HighQualityAntialiasing, true);
 
   const QRect centered(centeredRect()); 
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsMultiMonitor/lts_screen_container.cpp b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsMultiMonitor/lts_screen_container.cpp
index 35ce51804..219d6b63f 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsMultiMonitor/lts_screen_container.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsMultiMonitor/lts_screen_container.cpp
@@ -29,7 +29,7 @@ LtsScreenContainer::LtsScreenContainer(QRect screenGeo)
   , m_screenGeo(screenGeo)
 {
   
-  m_layout->setMargin(0);
+  m_layout->setContentsMargins(0, 0, 0, 0);
   m_layout->setSpacing(0);
   m_layout->setStretch(0, 999); 
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsMultiMonitor/lts_screen_normal.cpp b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsMultiMonitor/lts_screen_normal.cpp
index 39b25f7cf..0b074f0bf 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsMultiMonitor/lts_screen_normal.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsMultiMonitor/lts_screen_normal.cpp
@@ -30,7 +30,6 @@ LtsScreenNormal::LtsScreenNormal(QRect screenGeo, int screenId, bool debugMargin
   auto *theLayout = new QHBoxLayout;
 
   theLayout->setContentsMargins(0, 0, 0, 0);
-  theLayout->setMargin(0);
   theLayout->setSpacing(0);
   theLayout->setStretch(0, 999); 
   theLayout->addWidget(m_childContainer);
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsMultiMonitor/lts_screen_wide.cpp b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsMultiMonitor/lts_screen_wide.cpp
index 9116442c1..1a0111717 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsMultiMonitor/lts_screen_wide.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsMultiMonitor/lts_screen_wide.cpp
@@ -32,7 +32,6 @@ LtsScreenWide::LtsScreenWide(const QRect &screenGeo, int screenId, bool debugMar
   auto *theLayout = new QHBoxLayout;
 
   theLayout->setContentsMargins(0, 0, 0, 0);
-  theLayout->setMargin(0);
   theLayout->setSpacing(0);
   theLayout->setStretch(0, 9999); 
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsPluginManager/CMakeLists.txt b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsPluginManager/CMakeLists.txt
index 7baa874ee..525e29f46 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsPluginManager/CMakeLists.txt
+++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsPluginManager/CMakeLists.txt
@@ -37,6 +37,7 @@ NGL_WRAP_UI(ltspluginmanager_SRCS
   Ui/lts_plugin_manager_widget.ui
 )
 
+IF(BUILD_RTI)
 NGL_ADD_LIBRARY(WS LtsPluginManager SHARED ${ltspluginmanager_SRCS})
 
 NGL_TARGET_INCLUDE_DIRECTORIES(LtsPluginManager
@@ -61,5 +62,6 @@ NGL_TARGET_LINK_LIBRARIES(LtsPluginManager
 )
 
 NGL_INSTALL_TARGET(LtsPluginManager)
+ENDIF(BUILD_RTI)
 
 NGL_INSTALL_TARGET(LtsPluginLoader)
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsPrinting/CMakeLists.txt b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsPrinting/CMakeLists.txt
index ca0f09e37..3c1d27778 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsPrinting/CMakeLists.txt
+++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsPrinting/CMakeLists.txt
@@ -15,7 +15,7 @@ SET(SRCS
   printing.h
 )
 
-if (KDReports_FOUND)
+if (KDReports_FOUND AND BUILD_RTI)
   NGL_ADD_LIBRARY(WS LtsPrinting SHARED ${SRCS})
   NGL_TARGET_INCLUDE_DIRECTORIES(LtsPrinting
     PUBLIC
@@ -34,5 +34,5 @@ if (KDReports_FOUND)
   )
   NGL_INSTALL_TARGET(LtsPrinting)
 else()
-  message(STATUS "KDReports not found; skipping LtsPrinting target")
+  message(STATUS "KDReports not found or BUILD_RTI disabled; skipping LtsPrinting target")
 endif()
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsProjectionWorkstation/CMakeLists.txt b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsProjectionWorkstation/CMakeLists.txt
index 3dc2559ff..29c6d0eda 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsProjectionWorkstation/CMakeLists.txt
+++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsProjectionWorkstation/CMakeLists.txt
@@ -25,6 +25,7 @@ SET(LtsProjectionWorkstation_SRCS
   WebSocket/message_factory.cpp
 )
 
+IF(BUILD_RTI)
 NGL_ADD_LIBRARY(WS LtsProjectionWorkstation SHARED ${LtsProjectionWorkstation_SRCS})
 
 NGL_TARGET_INCLUDE_DIRECTORIES(LtsProjectionWorkstation
@@ -45,3 +46,4 @@ NGL_TARGET_LINK_LIBRARIES(LtsProjectionWorkstation
 )
 
 NGL_INSTALL_TARGET(LtsProjectionWorkstation)
+ENDIF(BUILD_RTI)
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsScriptTimeline/CMakeLists.txt b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsScriptTimeline/CMakeLists.txt
index 28e529b96..8295ea751 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsScriptTimeline/CMakeLists.txt
+++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsScriptTimeline/CMakeLists.txt
@@ -55,6 +55,9 @@ SET(LtsScriptTimeline_UICS
 
 NGL_WRAP_UI(LtsScriptTimeline_SRCS ${LtsScriptTimeline_UICS})
 
+SET(CMAKE_AUTOUIC_SEARCH_PATHS ${CMAKE_CURRENT_SOURCE_DIR}/Ui)
+
+IF(BUILD_RTI)
 NGL_ADD_LIBRARY2(WS LtsScriptTimeline SHARED ${LtsScriptTimeline_SRCS} ${LtsScriptTimeline_UICS})
 
 NGL_TARGET_INCLUDE_DIRECTORIES(LtsScriptTimeline
@@ -68,3 +71,4 @@ NGL_TARGET_LINK_LIBRARIES(LtsScriptTimeline
   LtsWidgets
   LtsSessionData
 )
+ENDIF(BUILD_RTI)
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsSession/CMakeLists.txt b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsSession/CMakeLists.txt
index 19277b512..4bdbea565 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsSession/CMakeLists.txt
+++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsSession/CMakeLists.txt
@@ -5,7 +5,7 @@
 # Created by Mike Wille, SLSE, 2016-05-15
 #
 
-
+IF(BUILD_RTI)
 # LtsSessionDataDds
 SET(LtsSessionDataDds_SRCS
   lts_session_data_dds.cpp
@@ -17,6 +17,7 @@ NGL_TARGET_INCLUDE_DIRECTORIES(LtsSessionDataDds
     ${CMAKE_CURRENT_SOURCE_DIR}/../
     ${CMAKE_CURRENT_BINARY_DIR}/../
 )
+IF(BUILD_RTI)
 NGL_TARGET_LINK_LIBRARIES(LtsSessionDataDds
   PRIVATE
     ddsconnector
@@ -25,6 +26,8 @@ NGL_TARGET_LINK_LIBRARIES(LtsSessionDataDds
     NGLLogger
     Qt6::Core
 )
+ENDIF(BUILD_RTI)
+ENDIF(BUILD_RTI)
 
 
 
@@ -38,6 +41,7 @@ SET(ltssession_SRCS
   lts_session_lock_handler.cpp
 )
 
+IF(BUILD_RTI)
 NGL_ADD_LIBRARY2(WS LtsSession SHARED ${ltssession_SRCS})
 NGL_TARGET_INCLUDE_DIRECTORIES(LtsSession
   PUBLIC
@@ -49,7 +53,6 @@ NGL_TARGET_LINK_LIBRARIES(LtsSession
     Qt6::Network
     LtsMultiMonitor
     LtsSessionData
-    ddsconnector
     LtsUtilsGuiDds # ReqHelpr & for Debug Menu ! TODO: rm on release!
     LtsNotification
     svcCoreClient # Core Ftc - for TLH
@@ -57,7 +60,6 @@ NGL_TARGET_LINK_LIBRARIES(LtsSession
     Qt6::Svg
   PUBLIC
     LtsWidgets
-    LtsSessionDataDds
     Qt6::Core
     GuiPluginInterface
     DataPluginInterface
@@ -65,6 +67,16 @@ NGL_TARGET_LINK_LIBRARIES(LtsSession
     ProjectConfig
 )
 
+IF(BUILD_RTI)
+  NGL_TARGET_LINK_LIBRARIES(LtsSession
+    PRIVATE
+      ddsconnector
+    PUBLIC
+      LtsSessionDataDds
+  )
+ENDIF(BUILD_RTI)
+ENDIF(BUILD_RTI)
+
 
 # LtsSessionData (avoid cross-deps between AppManager, Session and PluginManager)
 SET(LtsSessionData_SRCS
@@ -83,5 +95,13 @@ NGL_TARGET_LINK_LIBRARIES(LtsSessionData
   PUBLIC
     Qt6::Core
     Qt6::Gui # QPixmap as Storage for Profile Picture
-    ddscore
 )
+
+IF(BUILD_RTI)
+  IF(BUILD_RTI)
+NGL_TARGET_LINK_LIBRARIES(LtsSessionData
+    PUBLIC
+      ddscore
+  )
+ENDIF(BUILD_RTI)
+ENDIF(BUILD_RTI)
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsTimelineClassic/CMakeLists.txt b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsTimelineClassic/CMakeLists.txt
index a25c06766..453a1dec2 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsTimelineClassic/CMakeLists.txt
+++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsTimelineClassic/CMakeLists.txt
@@ -45,6 +45,7 @@ SET(timeline_UICS
 
 NGL_WRAP_UI(timeline_SRCS ${timeline_UICS})
 
+IF(BUILD_RTI)
 NGL_ADD_LIBRARY2(WS LtsTimelineClassic SHARED ${timeline_SRCS} ${timeline_UICS})
 
 NGL_TARGET_INCLUDE_DIRECTORIES(LtsTimelineClassic
@@ -79,4 +80,5 @@ IF(NEVER)
 ENDIF()
 
 NGL_INSTALL_TARGET(LtsTimelineClassic)
+ENDIF(BUILD_RTI)
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsUtils/LtsUtilsCore/CMakeLists.txt b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsUtils/LtsUtilsCore/CMakeLists.txt
index c422c633f..1b7d90411 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsUtils/LtsUtilsCore/CMakeLists.txt
+++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsUtils/LtsUtilsCore/CMakeLists.txt
@@ -50,8 +50,7 @@ NGL_TARGET_LINK_LIBRARIES(LtsUtilsCore
 #
 # --- Tests --------------------------------------------------------------
 #
-# IF (TARGET ddscore) // does not work, not yet included
-IF((BUILD_WS OR BUILD_SV) AND BUILD_TESTING)
+IF(BUILD_RTI AND (BUILD_WS OR BUILD_SV) AND BUILD_TESTING)
   ADD_EXECUTABLE(utils_test
     UnitTests/utils_test.cpp
     UnitTests/utils_test.h
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsUtils/LtsUtilsGui/CMakeLists.txt b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsUtils/LtsUtilsGui/CMakeLists.txt
index f4f8be558..fcd41d307 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsUtils/LtsUtilsGui/CMakeLists.txt
+++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsUtils/LtsUtilsGui/CMakeLists.txt
@@ -6,6 +6,8 @@
 # Created by Mike Wille, SLSE, 2016-09-19
 #
 
-ADD_SUBDIRECTORY(LtsUtilsGuiDds)
+IF(BUILD_RTI)
+  ADD_SUBDIRECTORY(LtsUtilsGuiDds)
+ENDIF()
 ADD_SUBDIRECTORY(ConnectDialog)
 ADD_SUBDIRECTORY(StyleManager)
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsUtils/LtsUtilsGui/LtsUtilsGuiDds/CMakeLists.txt b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsUtils/LtsUtilsGui/LtsUtilsGuiDds/CMakeLists.txt
index 2780628c5..723d7111e 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsUtils/LtsUtilsGui/LtsUtilsGuiDds/CMakeLists.txt
+++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsUtils/LtsUtilsGui/LtsUtilsGuiDds/CMakeLists.txt
@@ -17,7 +17,9 @@ NGL_ADD_LIBRARY2(WS LtsUtilsGuiDds SHARED ${SRCS})
 NGL_TARGET_INCLUDE_DIRECTORIES(LtsUtilsGuiDds
   PUBLIC
     ${CMAKE_CURRENT_SOURCE_DIR}/../
+    ${CMAKE_CURRENT_SOURCE_DIR}/../../../
 )
+IF(BUILD_RTI)
 NGL_TARGET_LINK_LIBRARIES(LtsUtilsGuiDds
   PRIVATE
     LtsUtilsCoreHeaderOnly
@@ -29,6 +31,7 @@ NGL_TARGET_LINK_LIBRARIES(LtsUtilsGuiDds
     Qt6::Core
     ddscore
 )
+ENDIF(BUILD_RTI)
 NGL_TARGET_COMPILE_DEFINITIONS(LtsUtilsGuiDds
   PUBLIC
     REQUEST_HELPER_WITH_GUI
@@ -40,6 +43,7 @@ NGL_TARGET_INCLUDE_DIRECTORIES(LtsUtilsDds
   PUBLIC
     ${CMAKE_CURRENT_SOURCE_DIR}/../
 )
+IF(BUILD_RTI)
 NGL_TARGET_LINK_LIBRARIES(LtsUtilsDds
   PRIVATE
     LtsUtilsCoreHeaderOnly
@@ -47,3 +51,4 @@ NGL_TARGET_LINK_LIBRARIES(LtsUtilsDds
     Qt6::Core
     ddscore
 )
+ENDIF(BUILD_RTI)
diff --git a/qt6-after/qt6-migrated-legatus/Lts/DDS/Core/CMakeLists.txt b/qt6-after/qt6-migrated-legatus/Lts/DDS/Core/CMakeLists.txt
index ae25565b1..dbc871d04 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/DDS/Core/CMakeLists.txt
+++ b/qt6-after/qt6-migrated-legatus/Lts/DDS/Core/CMakeLists.txt
@@ -38,6 +38,12 @@ CODEGEN_TOPIC_TYPEDEFS(SRCS_common ${xml_FILE})
 CODEGEN_CLIENT_TOPICS_IFC(SRCS_common ${xml_FILE})
 
 NGL_ADD_LIBRARY(WS AAR HLA SV ddscore SHARED ${SRCS_common})
+NGL_TARGET_INCLUDE_DIRECTORIES(ddscore
+  PUBLIC
+    ${CMAKE_CURRENT_SOURCE_DIR}/../../
+    ${CMAKE_CURRENT_BINARY_DIR}/../../
+)
+IF(BUILD_RTI)
 NGL_TARGET_LINK_LIBRARIES(ddscore
   PRIVATE
     NGLLogger
@@ -49,12 +55,7 @@ NGL_TARGET_LINK_LIBRARIES(ddscore
     RTI::nddscore # RTI_LOG_ANY_FAILURE_s (wo auch immer das herkommt)
     RTI::nddscpp2
 )
-
-NGL_TARGET_INCLUDE_DIRECTORIES(ddscore
-  PUBLIC
-    ${CMAKE_CURRENT_SOURCE_DIR}/../../
-    ${CMAKE_CURRENT_BINARY_DIR}/../../
-)
+ENDIF(BUILD_RTI)
 
 NGL_INSTALL_TARGET(ddscore)
 
@@ -79,6 +80,7 @@ NGL_TARGET_INCLUDE_DIRECTORIES(svcCoreClient
     ${CMAKE_CURRENT_BINARY_DIR}/../../
 )
 
+IF(BUILD_RTI)
 NGL_TARGET_LINK_LIBRARIES(svcCoreClient
   PRIVATE
     RTI::nddscpp2
@@ -87,6 +89,7 @@ NGL_TARGET_LINK_LIBRARIES(svcCoreClient
     ddscore
     ddsftc
 )
+ENDIF(BUILD_RTI)
 NGL_INSTALL_TARGET(svcCoreClient)
 
 #
diff --git a/qt6-after/qt6-migrated-legatus/Lts/DDS/DDSConnector/CMakeLists.txt b/qt6-after/qt6-migrated-legatus/Lts/DDS/DDSConnector/CMakeLists.txt
index d516c1511..a3e885eb3 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/DDS/DDSConnector/CMakeLists.txt
+++ b/qt6-after/qt6-migrated-legatus/Lts/DDS/DDSConnector/CMakeLists.txt
@@ -22,6 +22,7 @@ NGL_TARGET_INCLUDE_DIRECTORIES(
     ${CMAKE_CURRENT_SOURCE_DIR}/../../
 )
 IF(BUILD_RTI)
+IF(BUILD_RTI)
 NGL_TARGET_LINK_LIBRARIES(ddsconnector
   PRIVATE
     NGLLogger
@@ -35,6 +36,7 @@ NGL_TARGET_LINK_LIBRARIES(ddsconnector
     ProjectConfig
     Qt6::Core
 )
+ENDIF(BUILD_RTI)
 ELSE()
 NGL_TARGET_LINK_LIBRARIES(ddsconnector
   PRIVATE
diff --git a/qt6-after/qt6-migrated-legatus/Lts/DDS/DdsUnitTests/CMakeLists.txt b/qt6-after/qt6-migrated-legatus/Lts/DDS/DdsUnitTests/CMakeLists.txt
index ab158568a..5a430cefb 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/DDS/DdsUnitTests/CMakeLists.txt
+++ b/qt6-after/qt6-migrated-legatus/Lts/DDS/DdsUnitTests/CMakeLists.txt
@@ -22,6 +22,7 @@ CODEGEN_TOPIC_TYPEDEFS(SRCS_common ${xml_FILE})
 CODEGEN_CLIENT_TOPICS_IFC(SRCS_common ${xml_FILE})
 
 NGL_ADD_LIBRARY(ALL ddsut_common SHARED ${SRCS_common})
+IF(BUILD_RTI)
 NGL_TARGET_LINK_LIBRARIES(ddsut_common
   PRIVATE
     NGLLogger
@@ -33,6 +34,7 @@ NGL_TARGET_LINK_LIBRARIES(ddsut_common
     RTI::nddscpp2
     ddscore
 )
+ENDIF(BUILD_RTI)
 NGL_TARGET_INCLUDE_DIRECTORIES(ddsut_common
   PUBLIC
     ${CMAKE_CURRENT_SOURCE_DIR}/../
diff --git a/qt6-after/qt6-migrated-legatus/Lts/DDS/FTC/CMakeLists.txt b/qt6-after/qt6-migrated-legatus/Lts/DDS/FTC/CMakeLists.txt
index 28324bd3c..f6f9b3288 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/DDS/FTC/CMakeLists.txt
+++ b/qt6-after/qt6-migrated-legatus/Lts/DDS/FTC/CMakeLists.txt
@@ -52,9 +52,11 @@ NGL_TARGET_INCLUDE_DIRECTORIES(ddsftccore
   PUBLIC
     ${CMAKE_CURRENT_SOURCE_DIR}/../../ # 'DDS/FTC/...' reads better than only FTC
 )
+IF(BUILD_RTI)
 NGL_TARGET_LINK_LIBRARIES(ddsftccore
   PUBLIC
      Qt6::Core
      ddscore
 )
+ENDIF(BUILD_RTI)
 NGL_INSTALL_TARGET(ddsftccore)
diff --git a/qt6-after/qt6-migrated-legatus/Lts/DDS/FTS/CMakeLists.txt b/qt6-after/qt6-migrated-legatus/Lts/DDS/FTS/CMakeLists.txt
index 9f49b0689..671169eec 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/DDS/FTS/CMakeLists.txt
+++ b/qt6-after/qt6-migrated-legatus/Lts/DDS/FTS/CMakeLists.txt
@@ -33,6 +33,7 @@ NGL_TARGET_INCLUDE_DIRECTORIES(
     ${CMAKE_CURRENT_SOURCE_DIR}/../../
 )
 IF(BUILD_RTI)
+IF(BUILD_RTI)
 NGL_TARGET_LINK_LIBRARIES(ddsfts
   PRIVATE
     RTI::nddscore
@@ -45,6 +46,7 @@ NGL_TARGET_LINK_LIBRARIES(ddsfts
     ddsgen
     ddsfts_connext
 )
+ENDIF(BUILD_RTI)
 ELSE()
 NGL_TARGET_LINK_LIBRARIES(ddsfts
   PRIVATE
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/FilterManagement/Gui/Aes/Common/CMakeLists.txt b/qt6-after/qt6-migrated-legatus/Lts/Plugins/FilterManagement/Gui/Aes/Common/CMakeLists.txt
index 0e1927672..61379033c 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/FilterManagement/Gui/Aes/Common/CMakeLists.txt
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/FilterManagement/Gui/Aes/Common/CMakeLists.txt
@@ -17,6 +17,10 @@ SET(flt_aes_gui_common_SRCS
 )
 
 NGL_ADD_LIBRARY2(WS FltAesGuiCommon SHARED ${flt_aes_gui_common_SRCS})
+NGL_TARGET_INCLUDE_DIRECTORIES(FltAesGuiCommon
+  PUBLIC
+    ${CMAKE_BINARY_DIR}
+)
 NGL_TARGET_LINK_LIBRARIES(FltAesGuiCommon
   PRIVATE
     svcPpmCommon
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/OperatorManagement/Gui/Login/CMakeLists.txt b/qt6-after/qt6-migrated-legatus/Lts/Plugins/OperatorManagement/Gui/Login/CMakeLists.txt
index 223ebb85d..07f6f4827 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/OperatorManagement/Gui/Login/CMakeLists.txt
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/OperatorManagement/Gui/Login/CMakeLists.txt
@@ -37,6 +37,7 @@ if(CMAKE_VERSION VERSION_LESS 3.16.0 AND BOTAN_FOUND) # botan doesn't use cmake
 endif()
 
 
+IF(BUILD_RTI)
 NGL_TARGET_LINK_LIBRARIES(OpmLoginGuiPlugin
   NGLLogger
   OpmDataPluginInterface
@@ -65,6 +66,7 @@ NGL_TARGET_LINK_LIBRARIES(OpmLoginGuiPlugin
 
   ${LTS_BOTAN} # only if available
 )
+ENDIF(BUILD_RTI)
 
 NGL_INSTALL_TARGET(OpmLoginGuiPlugin)
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationReplayManagement/Gui/ReplayManagement/CMakeLists.txt b/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationReplayManagement/Gui/ReplayManagement/CMakeLists.txt
index be2fc8773..b32428092 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationReplayManagement/Gui/ReplayManagement/CMakeLists.txt
+++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationReplayManagement/Gui/ReplayManagement/CMakeLists.txt
@@ -23,6 +23,7 @@ NGL_WRAP_UI(replay_gui_SRCS
 )
 
 NGL_ADD_LIBRARY(WS SrmReplayManagementGuiPlugin MODULE ${replay_gui_SRCS})
+IF(BUILD_RTI)
 NGL_TARGET_LINK_LIBRARIES(SrmReplayManagementGuiPlugin
   NGLLogger
   LtsPrinting
@@ -40,6 +41,7 @@ NGL_TARGET_LINK_LIBRARIES(SrmReplayManagementGuiPlugin
   LtsAppManager # for windows tablet replay hack
   LtsUtilsCore
 )
+ENDIF(BUILD_RTI)
 
 NGL_INSTALL_TARGET(SrmReplayManagementGuiPlugin)
 
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 90b43c5dc..1bb448016 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/CMakeLists.txt
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/CMakeLists.txt
@@ -40,6 +40,7 @@ NGL_TARGET_INCLUDE_DIRECTORIES(svcBldCommon
     ${CMAKE_CURRENT_SOURCE_DIR}/../
     ${CMAKE_CURRENT_BINARY_DIR}/../
 )
+IF(BUILD_RTI)
 NGL_TARGET_LINK_LIBRARIES(svcBldCommon
   PRIVATE
     RTI::nddscpp2
@@ -50,6 +51,7 @@ NGL_TARGET_LINK_LIBRARIES(svcBldCommon
     svcPdmCommon
     NGLLogger
 )
+ENDIF(BUILD_RTI)
 NGL_INSTALL_TARGET(svcBldCommon)
 
 #
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 a573f2f59..bf74a9ccb 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/CombatNetRadio/CMakeLists.txt
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/CombatNetRadio/CMakeLists.txt
@@ -83,6 +83,7 @@ CODEGEN_HANDLE_SVC_XML(SRCS_exe ${xml_FILE})
 
 NGL_ADD_SVC_ICON(SRCS_exe)
 NGL_ADD_EXECUTABLE(AAR SV svcCombatNetRadio ${SRCS_exe})
+IF(BUILD_RTI)
 NGL_TARGET_LINK_LIBRARIES(svcCombatNetRadio
   ddsconnector
   ddscore
@@ -103,6 +104,7 @@ NGL_TARGET_LINK_LIBRARIES(svcCombatNetRadio
   svcAvmClient
   svcAsmClient
 )
+ENDIF(BUILD_RTI)
 NGL_INSTALL_TARGET(svcCombatNetRadio)
 NGL_INSTALL(AAR SV FILES log4cxx_cnr.props DESTINATION bin)
 NGL_ADD_TARGET_LINK(svcCombatNetRadio pCNR)
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 efb8a2d7e..20ad2c3b9 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/ComponentMonitor/CMakeLists.txt
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/ComponentMonitor/CMakeLists.txt
@@ -38,6 +38,7 @@ NGL_TARGET_INCLUDE_DIRECTORIES(svcCmoCommon
     ${CMAKE_CURRENT_SOURCE_DIR}/../
     ${CMAKE_CURRENT_BINARY_DIR}/../
 )
+IF(BUILD_RTI)
 NGL_TARGET_LINK_LIBRARIES(svcCmoCommon
   PRIVATE
     RTI::nddscpp2
@@ -47,6 +48,7 @@ NGL_TARGET_LINK_LIBRARIES(svcCmoCommon
     ngldb
     NGLLogger
 )
+ENDIF(BUILD_RTI)
 NGL_INSTALL_TARGET(svcCmoCommon)
 
 #
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 a1e2e7296..237104635 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/GuezNasat/CMakeLists.txt
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/GuezNasat/CMakeLists.txt
@@ -35,6 +35,7 @@ NGL_TARGET_INCLUDE_DIRECTORIES(svcGnaCommon
     ${CMAKE_CURRENT_SOURCE_DIR}/../
     ${CMAKE_CURRENT_BINARY_DIR}/../
 )
+IF(BUILD_RTI)
 NGL_TARGET_LINK_LIBRARIES(svcGnaCommon
   PRIVATE
     RTI::nddscpp2
@@ -44,6 +45,7 @@ NGL_TARGET_LINK_LIBRARIES(svcGnaCommon
     ddscore
     NGLLogger
 )
+ENDIF(BUILD_RTI)
 NGL_INSTALL_TARGET(svcGnaCommon)
 
 #
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 4e797b5df..5fbc24d1e 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/CMakeLists.txt
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/CMakeLists.txt
@@ -88,6 +88,7 @@ NGL_TARGET_INCLUDE_DIRECTORIES(svcTabCommon
     ${CMAKE_CURRENT_SOURCE_DIR}/../
     ${CMAKE_CURRENT_BINARY_DIR}/../
 )
+IF(BUILD_RTI)
 NGL_TARGET_LINK_LIBRARIES(svcTabCommon
   PRIVATE
     RTI::nddscpp2
@@ -100,6 +101,7 @@ NGL_TARGET_LINK_LIBRARIES(svcTabCommon
     svcPdmCommon
     LtsUtilsCoreHeaderOnly
 )
+ENDIF(BUILD_RTI)
 NGL_INSTALL_TARGET(svcTabCommon)
 
 #
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 efc7c97ba..c6e2daf30 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBaseOC/CMakeLists.txt
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBaseOC/CMakeLists.txt
@@ -40,6 +40,7 @@ NGL_TARGET_INCLUDE_DIRECTORIES(svcTabocCommon
     ${CMAKE_CURRENT_SOURCE_DIR}/../
     ${CMAKE_CURRENT_BINARY_DIR}/../
 )
+IF(BUILD_RTI)
 NGL_TARGET_LINK_LIBRARIES(svcTabocCommon
   PRIVATE
     RTI::nddscpp2
@@ -50,6 +51,7 @@ NGL_TARGET_LINK_LIBRARIES(svcTabocCommon
     LtsUtilsCoreHeaderOnly
     svcPdmCommon
 )
+ENDIF(BUILD_RTI)
 NGL_INSTALL_TARGET(svcTabocCommon)
 
 #
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 c70400de4..c0f62b75e 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/AlarmManagement/CMakeLists.txt
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/AlarmManagement/CMakeLists.txt
@@ -37,6 +37,7 @@ NGL_TARGET_INCLUDE_DIRECTORIES(svcAlmCommon
     ${CMAKE_CURRENT_SOURCE_DIR}/../
     ${CMAKE_CURRENT_BINARY_DIR}/../
 )
+IF(BUILD_RTI)
 NGL_TARGET_LINK_LIBRARIES(svcAlmCommon
   PRIVATE
     RTI::nddscpp2
@@ -47,6 +48,7 @@ NGL_TARGET_LINK_LIBRARIES(svcAlmCommon
     svcPdmCommon
     ngldb
 )
+ENDIF(BUILD_RTI)
 NGL_INSTALL_TARGET(svcAlmCommon)
 
 #
@@ -108,6 +110,7 @@ NGL_TARGET_INCLUDE_DIRECTORIES(svcAlmServer
     ${CMAKE_CURRENT_BINARY_DIR}/../
 )
 
+IF(BUILD_RTI)
 NGL_TARGET_LINK_LIBRARIES(svcAlmServer
   PRIVATE
     RTI::nddscpp2
@@ -133,6 +136,7 @@ NGL_TARGET_LINK_LIBRARIES(svcAlmServer
     svcAlmCommon
     ngldb
 )
+ENDIF(BUILD_RTI)
 NGL_INSTALL_TARGET(svcAlmServer)
 
 #
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 3130c85fb..a592537e0 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/CMakeLists.txt
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/CMakeLists.txt
@@ -76,6 +76,7 @@ NGL_TARGET_INCLUDE_DIRECTORIES(svcAesCommon
     ${CMAKE_CURRENT_SOURCE_DIR}/../
     ${CMAKE_CURRENT_BINARY_DIR}/../
 )
+IF(BUILD_RTI)
 NGL_TARGET_LINK_LIBRARIES(svcAesCommon
   PRIVATE
     RTI::nddscpp2
@@ -94,6 +95,7 @@ NGL_TARGET_LINK_LIBRARIES(svcAesCommon
     Trajectory
     ngldb
 )
+ENDIF(BUILD_RTI)
 NGL_INSTALL_TARGET(svcAesCommon)
 
 #
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 b8f3cd5ad..b7630c0b5 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/AssetManagement/CMakeLists.txt
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/AssetManagement/CMakeLists.txt
@@ -38,6 +38,7 @@ NGL_TARGET_INCLUDE_DIRECTORIES(svcAsmCommon
     ${CMAKE_CURRENT_SOURCE_DIR}/../
     ${CMAKE_CURRENT_BINARY_DIR}/../
 )
+IF(BUILD_RTI)
 NGL_TARGET_LINK_LIBRARIES(svcAsmCommon
   PRIVATE
     RTI::nddscpp2
@@ -47,6 +48,7 @@ NGL_TARGET_LINK_LIBRARIES(svcAsmCommon
     ddscore
     NGLLogger
 )
+ENDIF(BUILD_RTI)
 NGL_INSTALL_TARGET(svcAsmCommon)
 
 #
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 38d9bb40c..991220118 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/CMakeLists.txt
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/CMakeLists.txt
@@ -136,6 +136,7 @@ NGL_TARGET_INCLUDE_DIRECTORIES(svcAvmCommon
     ${CMAKE_CURRENT_SOURCE_DIR}/../
     ${CMAKE_CURRENT_BINARY_DIR}/../
 )
+IF(BUILD_RTI)
 NGL_TARGET_LINK_LIBRARIES(svcAvmCommon
   PRIVATE
     RTI::nddscpp2
@@ -150,6 +151,7 @@ NGL_TARGET_LINK_LIBRARIES(svcAvmCommon
     ngldb
     Boost::boost
 )
+ENDIF(BUILD_RTI)
 NGL_INSTALL_TARGET(svcAvmCommon)
 
 #
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 e99657365..d241b974e 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/CMakeLists.txt
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/CMakeLists.txt
@@ -47,6 +47,7 @@ NGL_TARGET_INCLUDE_DIRECTORIES(svcCesCommon
     ${CMAKE_CURRENT_SOURCE_DIR}/../
     ${CMAKE_CURRENT_BINARY_DIR}/../
 )
+IF(BUILD_RTI)
 NGL_TARGET_LINK_LIBRARIES(svcCesCommon
   PRIVATE
     RTI::nddscpp2
@@ -58,6 +59,7 @@ NGL_TARGET_LINK_LIBRARIES(svcCesCommon
     svcAesCommon   #for FuseType in  DetonationLocationRequest
     svcPdmCommon
 )
+ENDIF(BUILD_RTI)
 NGL_INSTALL_TARGET(svcCesCommon)
 
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/TargetAreas/CMakeLists.txt b/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/TargetAreas/CMakeLists.txt
index d26b16013..d5791e3f2 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/TargetAreas/CMakeLists.txt
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/TargetAreas/CMakeLists.txt
@@ -20,6 +20,7 @@ SET(SRCS
 
 NGL_ADD_LIBRARY(AAR SV cesPluginTargetAreas MODULE ${SRCS})
 NGL_INSTALL_TARGET(cesPluginTargetAreas)
+IF(BUILD_RTI)
 NGL_TARGET_LINK_LIBRARIES(cesPluginTargetAreas
   Qt6::Core
   Qt6::Widgets
@@ -32,4 +33,5 @@ NGL_TARGET_LINK_LIBRARIES(cesPluginTargetAreas
   LtsCoordTrans
   svcCoreClient
 )
+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 788907eb7..d4b779f9e 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/CodificationManagement/CMakeLists.txt
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/CodificationManagement/CMakeLists.txt
@@ -38,6 +38,7 @@ NGL_TARGET_INCLUDE_DIRECTORIES(svcCodCommon
     ${CMAKE_CURRENT_SOURCE_DIR}/../
     ${CMAKE_CURRENT_BINARY_DIR}/../
 )
+IF(BUILD_RTI)
 NGL_TARGET_LINK_LIBRARIES(svcCodCommon
   PRIVATE
     RTI::nddscpp2
@@ -47,6 +48,7 @@ NGL_TARGET_LINK_LIBRARIES(svcCodCommon
     ngldb
     NGLLogger
 )
+ENDIF(BUILD_RTI)
 NGL_INSTALL_TARGET(svcCodCommon)
 
 #
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 143a7531e..ce694972c 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowClient/CMakeLists.txt
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowClient/CMakeLists.txt
@@ -38,6 +38,7 @@ NGL_TARGET_INCLUDE_DIRECTORIES(svcEscCommon
     ${CMAKE_CURRENT_SOURCE_DIR}/../
     ${CMAKE_CURRENT_BINARY_DIR}/../
 )
+IF(BUILD_RTI)
 NGL_TARGET_LINK_LIBRARIES(svcEscCommon
   PRIVATE
     RTI::nddscpp2
@@ -48,6 +49,7 @@ NGL_TARGET_LINK_LIBRARIES(svcEscCommon
     ngldb
     NGLLogger
 )
+ENDIF(BUILD_RTI)
 NGL_INSTALL_TARGET(svcEscCommon)
 
 #
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 679a81486..b27ad7ce1 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowManagement/CMakeLists.txt
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowManagement/CMakeLists.txt
@@ -38,6 +38,7 @@ NGL_TARGET_INCLUDE_DIRECTORIES(svcEsmCommon
     ${CMAKE_CURRENT_SOURCE_DIR}/../
     ${CMAKE_CURRENT_BINARY_DIR}/../
 )
+IF(BUILD_RTI)
 NGL_TARGET_LINK_LIBRARIES(svcEsmCommon
   PRIVATE
     RTI::nddscpp2
@@ -47,6 +48,7 @@ NGL_TARGET_LINK_LIBRARIES(svcEsmCommon
     ngldb
     NGLLogger
 )
+ENDIF(BUILD_RTI)
 NGL_INSTALL_TARGET(svcEsmCommon)
 
 #
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 d54647a69..57bb95f8a 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/Evaluations/CMakeLists.txt
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/Evaluations/CMakeLists.txt
@@ -45,6 +45,7 @@ NGL_TARGET_INCLUDE_DIRECTORIES(svcEvlCommon
     ${CMAKE_CURRENT_SOURCE_DIR}/../
     ${CMAKE_CURRENT_BINARY_DIR}/../
 )
+IF(BUILD_RTI)
 NGL_TARGET_LINK_LIBRARIES(svcEvlCommon
   PRIVATE
     RTI::nddscpp2
@@ -54,6 +55,7 @@ NGL_TARGET_LINK_LIBRARIES(svcEvlCommon
     NGLLogger
     ngldb
 )
+ENDIF(BUILD_RTI)
 NGL_INSTALL_TARGET(svcEvlCommon)
 
 #
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 12acf3935..d0067aedc 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/ExerciseEventManagement/CMakeLists.txt
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/ExerciseEventManagement/CMakeLists.txt
@@ -41,6 +41,7 @@ NGL_TARGET_INCLUDE_DIRECTORIES(svcEemCommon
     ${CMAKE_CURRENT_SOURCE_DIR}/../
     ${CMAKE_CURRENT_BINARY_DIR}/../
 )
+IF(BUILD_RTI)
 NGL_TARGET_LINK_LIBRARIES(svcEemCommon
   PRIVATE
     RTI::nddscpp2
@@ -52,6 +53,7 @@ NGL_TARGET_LINK_LIBRARIES(svcEemCommon
     ngldb
     svcPdmCommon
 )
+ENDIF(BUILD_RTI)
 NGL_INSTALL_TARGET(svcEemCommon)
 
 #
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 0c2d61a4a..e7cfa11c8 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/ExerciseManagement/CMakeLists.txt
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/ExerciseManagement/CMakeLists.txt
@@ -38,6 +38,7 @@ NGL_TARGET_INCLUDE_DIRECTORIES(svcExmCommon
     ${CMAKE_CURRENT_SOURCE_DIR}/../
     ${CMAKE_CURRENT_BINARY_DIR}/../
 )
+IF(BUILD_RTI)
 NGL_TARGET_LINK_LIBRARIES(svcExmCommon
   PRIVATE
     RTI::nddscpp2
@@ -48,6 +49,7 @@ NGL_TARGET_LINK_LIBRARIES(svcExmCommon
     ngldb
     LtsUtilsCore
 )
+ENDIF(BUILD_RTI)
 NGL_INSTALL_TARGET(svcExmCommon)
 
 #
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 8757a7b97..09d68ebe5 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/FileManagement/CMakeLists.txt
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/FileManagement/CMakeLists.txt
@@ -40,6 +40,7 @@ NGL_TARGET_INCLUDE_DIRECTORIES(svcFlmCommon
     ${CMAKE_CURRENT_SOURCE_DIR}/../
     ${CMAKE_CURRENT_BINARY_DIR}/../
 )
+IF(BUILD_RTI)
 NGL_TARGET_LINK_LIBRARIES(svcFlmCommon
   PRIVATE
     RTI::nddscpp2
@@ -50,6 +51,7 @@ NGL_TARGET_LINK_LIBRARIES(svcFlmCommon
     LtsUtilsCore
     NGLLogger
 )
+ENDIF(BUILD_RTI)
 NGL_INSTALL_TARGET(svcFlmCommon)
 
 #
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 4b9e8a26e..0bb7f124f 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/FilterManagement/CMakeLists.txt
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/FilterManagement/CMakeLists.txt
@@ -38,6 +38,7 @@ NGL_TARGET_INCLUDE_DIRECTORIES(svcFltCommon
     ${CMAKE_CURRENT_SOURCE_DIR}/../
     ${CMAKE_CURRENT_BINARY_DIR}/../
 )
+IF(BUILD_RTI)
 NGL_TARGET_LINK_LIBRARIES(svcFltCommon
   PRIVATE
     RTI::nddscpp2
@@ -47,6 +48,7 @@ NGL_TARGET_LINK_LIBRARIES(svcFltCommon
     ddscore
     NGLLogger
 )
+ENDIF(BUILD_RTI)
 NGL_INSTALL_TARGET(svcFltCommon)
 
 #
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 cf8d08370..930a797eb 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/GuezIedManagement/CMakeLists.txt
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/GuezIedManagement/CMakeLists.txt
@@ -38,6 +38,7 @@ NGL_TARGET_INCLUDE_DIRECTORIES(svcGimCommon
     ${CMAKE_CURRENT_SOURCE_DIR}/../
     ${CMAKE_CURRENT_BINARY_DIR}/../
 )
+IF(BUILD_RTI)
 NGL_TARGET_LINK_LIBRARIES(svcGimCommon
   PRIVATE
     RTI::nddscpp2
@@ -48,6 +49,7 @@ NGL_TARGET_LINK_LIBRARIES(svcGimCommon
     LtsUtilsCore
     NGLLogger
 )
+ENDIF(BUILD_RTI)
 NGL_INSTALL_TARGET(svcGimCommon)
 
 #
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 92f2d0fb2..d0d87d956 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/InfrastructureManagement/CMakeLists.txt
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/InfrastructureManagement/CMakeLists.txt
@@ -41,6 +41,7 @@ NGL_TARGET_INCLUDE_DIRECTORIES(svcIsmCommon
     ${CMAKE_CURRENT_SOURCE_DIR}/../
     ${CMAKE_CURRENT_BINARY_DIR}/../
 )
+IF(BUILD_RTI)
 NGL_TARGET_LINK_LIBRARIES(svcIsmCommon
   PRIVATE
     RTI::nddscpp2
@@ -51,6 +52,7 @@ NGL_TARGET_LINK_LIBRARIES(svcIsmCommon
     ngldb
     NGLLogger
 )
+ENDIF(BUILD_RTI)
 NGL_INSTALL_TARGET(svcIsmCommon)
 
 #
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 d6ac51b40..2e566a5f1 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/MarkerManagement/CMakeLists.txt
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/MarkerManagement/CMakeLists.txt
@@ -38,6 +38,7 @@ NGL_TARGET_INCLUDE_DIRECTORIES(svcMrkCommon
     ${CMAKE_CURRENT_SOURCE_DIR}/../
     ${CMAKE_CURRENT_BINARY_DIR}/../
 )
+IF(BUILD_RTI)
 NGL_TARGET_LINK_LIBRARIES(svcMrkCommon
   PRIVATE
     RTI::nddscpp2
@@ -47,6 +48,7 @@ NGL_TARGET_LINK_LIBRARIES(svcMrkCommon
     ddscore
     NGLLogger
 )
+ENDIF(BUILD_RTI)
 NGL_INSTALL_TARGET(svcMrkCommon)
 
 #
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 8a4c6340d..b6776b824 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/Messaging/CMakeLists.txt
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/Messaging/CMakeLists.txt
@@ -38,6 +38,7 @@ NGL_TARGET_INCLUDE_DIRECTORIES(svcMsgCommon
     ${CMAKE_CURRENT_SOURCE_DIR}/../
     ${CMAKE_CURRENT_BINARY_DIR}/../
 )
+IF(BUILD_RTI)
 NGL_TARGET_LINK_LIBRARIES(svcMsgCommon
   PRIVATE
     RTI::nddscpp2
@@ -48,6 +49,7 @@ NGL_TARGET_LINK_LIBRARIES(svcMsgCommon
     LtsCommandLineParser
     NGLLogger
 )
+ENDIF(BUILD_RTI)
 NGL_INSTALL_TARGET(svcMsgCommon)
 
 #
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 527f64d50..86739786e 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/MeteoDataManagement/CMakeLists.txt
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/MeteoDataManagement/CMakeLists.txt
@@ -38,6 +38,7 @@ NGL_TARGET_INCLUDE_DIRECTORIES(svcMdmCommon
     ${CMAKE_CURRENT_SOURCE_DIR}/../
     ${CMAKE_CURRENT_BINARY_DIR}/../
 )
+IF(BUILD_RTI)
 NGL_TARGET_LINK_LIBRARIES(svcMdmCommon
   PRIVATE
     RTI::nddscpp2
@@ -47,6 +48,7 @@ NGL_TARGET_LINK_LIBRARIES(svcMdmCommon
     NGLLogger
     ngldb
 )
+ENDIF(BUILD_RTI)
 NGL_INSTALL_TARGET(svcMdmCommon)
 
 #
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 09b43597b..af6c48b23 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/NmeaManagement/CMakeLists.txt
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/NmeaManagement/CMakeLists.txt
@@ -36,6 +36,7 @@ NGL_TARGET_INCLUDE_DIRECTORIES(svcNmeCommon
     ${CMAKE_CURRENT_SOURCE_DIR}/../
     ${CMAKE_CURRENT_BINARY_DIR}/../
 )
+IF(BUILD_RTI)
 NGL_TARGET_LINK_LIBRARIES(svcNmeCommon
   PRIVATE
     RTI::nddscpp2
@@ -44,6 +45,7 @@ NGL_TARGET_LINK_LIBRARIES(svcNmeCommon
     ddscore
     NGLLogger
 )
+ENDIF(BUILD_RTI)
 NGL_INSTALL_TARGET(svcNmeCommon)
 
 #
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 8defc0325..35246af36 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/NotificationManagement/CMakeLists.txt
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/NotificationManagement/CMakeLists.txt
@@ -38,6 +38,7 @@ NGL_TARGET_INCLUDE_DIRECTORIES(svcNomCommon
     ${CMAKE_CURRENT_SOURCE_DIR}/../
     ${CMAKE_CURRENT_BINARY_DIR}/../
 )
+IF(BUILD_RTI)
 NGL_TARGET_LINK_LIBRARIES(svcNomCommon
   PRIVATE
     RTI::nddscpp2
@@ -48,6 +49,7 @@ NGL_TARGET_LINK_LIBRARIES(svcNomCommon
     LtsCommandLineParser
     NGLLogger
 )
+ENDIF(BUILD_RTI)
 NGL_INSTALL_TARGET(svcNomCommon)
 
 #
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 c08ecc543..98766c203 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/OcBaseDownload/CMakeLists.txt
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/OcBaseDownload/CMakeLists.txt
@@ -38,6 +38,7 @@ NGL_TARGET_INCLUDE_DIRECTORIES(svcObdCommon
     ${CMAKE_CURRENT_SOURCE_DIR}/../
     ${CMAKE_CURRENT_BINARY_DIR}/../
 )
+IF(BUILD_RTI)
 NGL_TARGET_LINK_LIBRARIES(svcObdCommon
   PRIVATE
     RTI::nddscpp2
@@ -47,6 +48,7 @@ NGL_TARGET_LINK_LIBRARIES(svcObdCommon
     ddscore
     NGLLogger
 )
+ENDIF(BUILD_RTI)
 NGL_INSTALL_TARGET(svcObdCommon)
 
 #
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 c01914dcc..5698eb6e2 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/OcSituationClient/CMakeLists.txt
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/OcSituationClient/CMakeLists.txt
@@ -51,6 +51,7 @@ NGL_TARGET_INCLUDE_DIRECTORIES(svcOscCommon
     ${CMAKE_CURRENT_SOURCE_DIR}/../
     ${CMAKE_CURRENT_BINARY_DIR}/../
 )
+IF(BUILD_RTI)
 NGL_TARGET_LINK_LIBRARIES(svcOscCommon
   PRIVATE
     RTI::nddscpp2
@@ -60,6 +61,7 @@ NGL_TARGET_LINK_LIBRARIES(svcOscCommon
     NGLLogger
     ngldb
 )
+ENDIF(BUILD_RTI)
 NGL_INSTALL_TARGET(svcOscCommon)
 
 #
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 c50ea380a..bee43343b 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/OcSituationServer/CMakeLists.txt
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/OcSituationServer/CMakeLists.txt
@@ -53,6 +53,7 @@ NGL_TARGET_INCLUDE_DIRECTORIES(svcOssCommon
     ${CMAKE_CURRENT_SOURCE_DIR}/../
     ${CMAKE_CURRENT_BINARY_DIR}/../
 )
+IF(BUILD_RTI)
 NGL_TARGET_LINK_LIBRARIES(svcOssCommon
   PRIVATE
     RTI::nddscpp2
@@ -63,6 +64,7 @@ NGL_TARGET_LINK_LIBRARIES(svcOssCommon
     ddscore
     NGLLogger
 )
+ENDIF(BUILD_RTI)
 NGL_INSTALL_TARGET(svcOssCommon)
 
 #
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 0d8d07214..44722d3be 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/OperatorManagement/CMakeLists.txt
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/OperatorManagement/CMakeLists.txt
@@ -38,6 +38,7 @@ NGL_TARGET_INCLUDE_DIRECTORIES(svcOpmCommon
     ${CMAKE_CURRENT_SOURCE_DIR}/../
     ${CMAKE_CURRENT_BINARY_DIR}/../
 )
+IF(BUILD_RTI)
 NGL_TARGET_LINK_LIBRARIES(svcOpmCommon
   PRIVATE
     RTI::nddscpp2
@@ -48,6 +49,7 @@ NGL_TARGET_LINK_LIBRARIES(svcOpmCommon
     LtsUtilsCore
     NGLLogger
 )
+ENDIF(BUILD_RTI)
 NGL_INSTALL_TARGET(svcOpmCommon)
 
 #
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 536782b5d..15da04676 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/ParticipantManagement/CMakeLists.txt
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/ParticipantManagement/CMakeLists.txt
@@ -44,6 +44,7 @@ NGL_TARGET_INCLUDE_DIRECTORIES(svcPpmCommon
     ${CMAKE_CURRENT_SOURCE_DIR}/../
     ${CMAKE_CURRENT_BINARY_DIR}/../
 )
+IF(BUILD_RTI)
 NGL_TARGET_LINK_LIBRARIES(svcPpmCommon
   PRIVATE
     RTI::nddscpp2
@@ -58,6 +59,7 @@ NGL_TARGET_LINK_LIBRARIES(svcPpmCommon
     LtsCoordTrans
     ngldb
 )
+ENDIF(BUILD_RTI)
 NGL_INSTALL_TARGET(svcPpmCommon)
 
 #
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 a41a145d0..7c7f27c3f 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/PresentationManagement/CMakeLists.txt
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/PresentationManagement/CMakeLists.txt
@@ -38,6 +38,7 @@ NGL_TARGET_INCLUDE_DIRECTORIES(svcPreCommon
     ${CMAKE_CURRENT_SOURCE_DIR}/../
     ${CMAKE_CURRENT_BINARY_DIR}/../
 )
+IF(BUILD_RTI)
 NGL_TARGET_LINK_LIBRARIES(svcPreCommon
   PRIVATE
     RTI::nddscpp2
@@ -47,6 +48,7 @@ NGL_TARGET_LINK_LIBRARIES(svcPreCommon
     NGLLogger
     ngldb
 )
+ENDIF(BUILD_RTI)
 NGL_INSTALL_TARGET(svcPreCommon)
 
 #
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/ProjectDataManagement/CMakeLists.txt b/qt6-after/qt6-migrated-legatus/Lts/Services/ProjectDataManagement/CMakeLists.txt
index 2158e4fc6..83575ddc5 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/ProjectDataManagement/CMakeLists.txt
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/ProjectDataManagement/CMakeLists.txt
@@ -45,6 +45,7 @@ NGL_TARGET_INCLUDE_DIRECTORIES(svcPdmCommon
     ${CMAKE_CURRENT_SOURCE_DIR}/../
     ${CMAKE_CURRENT_BINARY_DIR}/../
 )
+IF(BUILD_RTI)
 NGL_TARGET_LINK_LIBRARIES(svcPdmCommon
   PRIVATE
     RTI::nddscpp2
@@ -55,6 +56,7 @@ NGL_TARGET_LINK_LIBRARIES(svcPdmCommon
     LtsUtilsCore
     ngldb
 )
+ENDIF(BUILD_RTI)
 NGL_INSTALL_TARGET(svcPdmCommon)
 
 #
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/RecordingManagement/CMakeLists.txt b/qt6-after/qt6-migrated-legatus/Lts/Services/RecordingManagement/CMakeLists.txt
index 4c3458449..8ce719408 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/RecordingManagement/CMakeLists.txt
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/RecordingManagement/CMakeLists.txt
@@ -39,6 +39,7 @@ NGL_TARGET_INCLUDE_DIRECTORIES(svcRecCommon
     ${CMAKE_CURRENT_SOURCE_DIR}/../
     ${CMAKE_CURRENT_BINARY_DIR}/../
 )
+IF(BUILD_RTI)
 NGL_TARGET_LINK_LIBRARIES(svcRecCommon
   PRIVATE
     RTI::nddscpp2
@@ -49,6 +50,7 @@ NGL_TARGET_LINK_LIBRARIES(svcRecCommon
     ddscore
     NGLLogger
 )
+ENDIF(BUILD_RTI)
 NGL_INSTALL_TARGET(svcRecCommon)
 
 #
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 c167189d9..54e292afe 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/ReportManagement/CMakeLists.txt
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/ReportManagement/CMakeLists.txt
@@ -36,6 +36,7 @@ NGL_TARGET_INCLUDE_DIRECTORIES(svcRepCommon
     ${CMAKE_CURRENT_SOURCE_DIR}/../
     ${CMAKE_CURRENT_BINARY_DIR}/../
 )
+IF(BUILD_RTI)
 NGL_TARGET_LINK_LIBRARIES(svcRepCommon
   PRIVATE
     RTI::nddscpp2
@@ -47,6 +48,7 @@ NGL_TARGET_LINK_LIBRARIES(svcRepCommon
     svcPdmCommon
     LtsUtilsCoreHeaderOnly
 )
+ENDIF(BUILD_RTI)
 NGL_INSTALL_TARGET(svcRepCommon)
 
 #
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/RoutingServiceNG/CMakeLists.txt b/qt6-after/qt6-migrated-legatus/Lts/Services/RoutingServiceNG/CMakeLists.txt
index 59cba8f70..c6139a44d 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/RoutingServiceNG/CMakeLists.txt
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/RoutingServiceNG/CMakeLists.txt
@@ -43,6 +43,7 @@ NGL_TARGET_LINK_LIBRARIES(rscCommon
 
 #NGL_ADD_SVC_ICON(SRCS_exe)
 #NGL_ADD_EXECUTABLE(AAR SV svcRoutingServiceNG ${SRCS_exe})
+#IF(BUILD_RTI)
 #NGL_TARGET_LINK_LIBRARIES(svcRoutingServiceNG
 #  rscCommon
 #  Qt6::Core
@@ -60,6 +61,7 @@ NGL_TARGET_LINK_LIBRARIES(rscCommon
 #  svcCoreClient
 #  svcExmClient
 #)
+#ENDIF(BUILD_RTI)
 #NGL_INSTALL_TARGET(svcRoutingServiceNG)
 #NGL_INSTALL(AAR SV FILES log4cxx_rsc.props DESTINATION bin)
 #NGL_ADD_TARGET_LINK(svcRoutingServiceNG sRSC)
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 058d96792..af18f7973 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/ServiceManagement/CMakeLists.txt
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/ServiceManagement/CMakeLists.txt
@@ -38,6 +38,7 @@ NGL_TARGET_INCLUDE_DIRECTORIES(svcScmCommon
     ${CMAKE_CURRENT_SOURCE_DIR}/../
     ${CMAKE_CURRENT_BINARY_DIR}/../
 )
+IF(BUILD_RTI)
 NGL_TARGET_LINK_LIBRARIES(svcScmCommon
   PRIVATE
     RTI::nddscpp2
@@ -47,6 +48,7 @@ NGL_TARGET_LINK_LIBRARIES(svcScmCommon
     NGLLogger
     ngldb
 )
+ENDIF(BUILD_RTI)
 NGL_INSTALL_TARGET(svcScmCommon)
 
 #
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 e4aa1da81..a23495405 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/SituationReplay/CMakeLists.txt
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/SituationReplay/CMakeLists.txt
@@ -39,6 +39,7 @@ NGL_TARGET_INCLUDE_DIRECTORIES(svcSrpCommon
     ${CMAKE_CURRENT_SOURCE_DIR}/../
     ${CMAKE_CURRENT_BINARY_DIR}/../
 )
+IF(BUILD_RTI)
 NGL_TARGET_LINK_LIBRARIES(svcSrpCommon
   PRIVATE
     RTI::nddscpp2
@@ -48,6 +49,7 @@ NGL_TARGET_LINK_LIBRARIES(svcSrpCommon
     ddscore
     NGLLogger
 )
+ENDIF(BUILD_RTI)
 NGL_INSTALL_TARGET(svcSrpCommon)
 
 #
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/SituationReplayManagement/CMakeLists.txt b/qt6-after/qt6-migrated-legatus/Lts/Services/SituationReplayManagement/CMakeLists.txt
index 381d32b03..0cf0f5db1 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/SituationReplayManagement/CMakeLists.txt
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/SituationReplayManagement/CMakeLists.txt
@@ -36,6 +36,7 @@ NGL_TARGET_INCLUDE_DIRECTORIES(svcSrmCommon
     ${CMAKE_CURRENT_SOURCE_DIR}/../
     ${CMAKE_CURRENT_BINARY_DIR}/../
 )
+IF(BUILD_RTI)
 NGL_TARGET_LINK_LIBRARIES(svcSrmCommon
   PRIVATE
     RTI::nddscpp2
@@ -44,4 +45,5 @@ NGL_TARGET_LINK_LIBRARIES(svcSrmCommon
     ddscore
     NGLLogger
 )
+ENDIF(BUILD_RTI)
 NGL_INSTALL_TARGET(svcSrmCommon)
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 ba1e74298..5bad7126b 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/SoundManagement/CMakeLists.txt
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/SoundManagement/CMakeLists.txt
@@ -38,6 +38,7 @@ NGL_TARGET_INCLUDE_DIRECTORIES(svcSomCommon
     ${CMAKE_CURRENT_SOURCE_DIR}/../
     ${CMAKE_CURRENT_BINARY_DIR}/../
 )
+IF(BUILD_RTI)
 NGL_TARGET_LINK_LIBRARIES(svcSomCommon
   PRIVATE
     RTI::nddscpp2
@@ -47,6 +48,7 @@ NGL_TARGET_LINK_LIBRARIES(svcSomCommon
     ngldb
     NGLLogger
 )
+ENDIF(BUILD_RTI)
 NGL_INSTALL_TARGET(svcSomCommon)
 
 #
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 68acf03d2..6dda1ba58 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/TargetManagement/CMakeLists.txt
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/TargetManagement/CMakeLists.txt
@@ -38,6 +38,7 @@ NGL_TARGET_INCLUDE_DIRECTORIES(svcTgtCommon
     ${CMAKE_CURRENT_SOURCE_DIR}/../
     ${CMAKE_CURRENT_BINARY_DIR}/../
 )
+IF(BUILD_RTI)
 NGL_TARGET_LINK_LIBRARIES(svcTgtCommon
   PRIVATE
     RTI::nddscpp2
@@ -47,6 +48,7 @@ NGL_TARGET_LINK_LIBRARIES(svcTgtCommon
     NGLLogger
     ngldb
 )
+ENDIF(BUILD_RTI)
 NGL_INSTALL_TARGET(svcTgtCommon)
 
 #
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/VideoOverlayManagement/CMakeLists.txt b/qt6-after/qt6-migrated-legatus/Lts/Services/VideoOverlayManagement/CMakeLists.txt
index ba2879d1e..aba6661b3 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/VideoOverlayManagement/CMakeLists.txt
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/VideoOverlayManagement/CMakeLists.txt
@@ -33,6 +33,7 @@ CODEGEN_HANDLE_SVC_XML(SRCS_exe ${xml_FILE})
 
 NGL_ADD_SVC_ICON(SRCS_exe)
 NGL_ADD_EXECUTABLE(AAR SV svcVideoOverlayManagement ${SRCS_exe})
+IF(BUILD_RTI)
 NGL_TARGET_LINK_LIBRARIES(svcVideoOverlayManagement
   Qt6::Core
   Qt6::Network
@@ -48,6 +49,7 @@ NGL_TARGET_LINK_LIBRARIES(svcVideoOverlayManagement
   ddscore
   ngltools
 )
+ENDIF(BUILD_RTI)
 NGL_INSTALL_TARGET(svcVideoOverlayManagement)
 NGL_INSTALL(AAR SV FILES log4cxx_vom.props DESTINATION bin)
 NGL_ADD_TARGET_LINK(svcVideoOverlayManagement sVOM)
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 075dc99f1..eceff723e 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/WarehouseGuez/CMakeLists.txt
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/WarehouseGuez/CMakeLists.txt
@@ -38,6 +38,7 @@ NGL_TARGET_INCLUDE_DIRECTORIES(svcWhgCommon
     ${CMAKE_CURRENT_SOURCE_DIR}/../
     ${CMAKE_CURRENT_BINARY_DIR}/../
 )
+IF(BUILD_RTI)
 NGL_TARGET_LINK_LIBRARIES(svcWhgCommon
   PRIVATE
     RTI::nddscpp2
@@ -47,6 +48,7 @@ NGL_TARGET_LINK_LIBRARIES(svcWhgCommon
     NGLLogger
     ngldb
 )
+ENDIF(BUILD_RTI)
 NGL_INSTALL_TARGET(svcWhgCommon)
 
 #
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 edaceaa52..892d1c7bd 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
@@ -36,6 +36,7 @@ NGL_TARGET_INCLUDE_DIRECTORIES(svcXxxCommon
     ${CMAKE_CURRENT_SOURCE_DIR}/../
     ${CMAKE_CURRENT_BINARY_DIR}/../
 )
+IF(BUILD_RTI)
 NGL_TARGET_LINK_LIBRARIES(svcXxxCommon
   PRIVATE
     RTI::nddscpp2
@@ -44,6 +45,7 @@ NGL_TARGET_LINK_LIBRARIES(svcXxxCommon
     ddscore
     NGLLogger
 )
+ENDIF(BUILD_RTI)
 NGL_INSTALL_TARGET(svcXxxCommon)
 
 #
diff --git a/qt6-after/qt6-migrated-legatus/Z/src/nglwidgets/CMakeLists.txt b/qt6-after/qt6-migrated-legatus/Z/src/nglwidgets/CMakeLists.txt
index c6702e04d..7177d002b 100755
--- a/qt6-after/qt6-migrated-legatus/Z/src/nglwidgets/CMakeLists.txt
+++ b/qt6-after/qt6-migrated-legatus/Z/src/nglwidgets/CMakeLists.txt
@@ -45,14 +45,14 @@ endif()
 NGL_ADD_LIBRARY(WS AAR SV nglwidgets SHARED ${nglwidgets_SRCS} ${oxygen_SRCS})
 NGL_TARGET_INCLUDE_DIRECTORIES(nglwidgets
   PRIVATE
-    ${POPPLER_QT5_INCLUDE_DIR}
+    ${POPPLER_QT6_INCLUDE_DIR}
 )
 NGL_TARGET_LINK_LIBRARIES(nglwidgets
   PRIVATE
     NGLLogger
     ngltranslator
     ngltools
-    ${POPPLER_QT5_LIBRARY}
+    ${POPPLER_QT6_LIBRARY}
   PUBLIC
     Qt6::Core
     Qt6::Widgets
diff --git a/qt6-after/qt6-migrated-legatus/Z/src/nglwidgets/nglpdfdocument.h b/qt6-after/qt6-migrated-legatus/Z/src/nglwidgets/nglpdfdocument.h
index f70f6acad..90f882f2b 100755
--- a/qt6-after/qt6-migrated-legatus/Z/src/nglwidgets/nglpdfdocument.h
+++ b/qt6-after/qt6-migrated-legatus/Z/src/nglwidgets/nglpdfdocument.h
@@ -4,7 +4,7 @@
 #include <QString>
 #include <QVector>
 #include <QPointer>
-#include <poppler/qt5/poppler-qt5.h>
+#include <poppler/qt6/poppler-qt6.h>
 
 #include "nglwidgets_export.h"
 
diff --git a/qt6-after/qt6-migrated-legatus/Z/src/nglwidgets/nglpdfpage.h b/qt6-after/qt6-migrated-legatus/Z/src/nglwidgets/nglpdfpage.h
index 85b508050..2479a287d 100755
--- a/qt6-after/qt6-migrated-legatus/Z/src/nglwidgets/nglpdfpage.h
+++ b/qt6-after/qt6-migrated-legatus/Z/src/nglwidgets/nglpdfpage.h
@@ -3,7 +3,7 @@
 #include <QtCore/QSizeF>
 #include <QWidget>
 #include <QtGui/QPixmap>
-#include <poppler/qt5/poppler-qt5.h>
+#include <poppler/qt6/poppler-qt6.h>
 #include <vector>
 #include <memory>
 
diff --git a/qt6-after/qt6-migrated-legatus/cmake/FindPopplerQt6.cmake b/qt6-after/qt6-migrated-legatus/cmake/FindPopplerQt6.cmake
index d0b1ff517..6fcb6d50e 100755
--- a/qt6-after/qt6-migrated-legatus/cmake/FindPopplerQt6.cmake
+++ b/qt6-after/qt6-migrated-legatus/cmake/FindPopplerQt6.cmake
@@ -11,106 +11,93 @@
 
 
 
-if(POPPLER_QT5_INCLUDE_DIR AND POPPLER_QT5_LIBRARY)
+# FindPopplerQt6.cmake - Find Poppler Qt6 bindings
+# Sets: POPPLER_QT6_INCLUDE_DIR, POPPLER_QT6_LIBRARY, PopplerQt6::Poppler target
 
-  
-  set(POPPLER_QT5_FOUND TRUE)
+if(POPPLER_QT6_INCLUDE_DIR AND POPPLER_QT6_LIBRARY)
+  set(POPPLER_QT6_FOUND TRUE)
+else()
+  set(_poppler_version_bad FALSE)
 
-else(POPPLER_QT5_INCLUDE_DIR AND POPPLER_QT5_LIBRARY)
-
-set(_poppler_version_bad FALSE)
-
-if(NOT WIN32)
-  
-  
-  include(FindPkgConfig)
-  # Prefer poppler-qt6 if available, fall back to poppler-qt6
-  pkg_check_modules(_pc_poppler poppler-qt6)
-  if(_pc_poppler_FOUND)
-    set(_pc_poppler_pkgname poppler-qt6)
-  else()
+  if(NOT WIN32)
+    include(FindPkgConfig)
+    # Prefer poppler-qt6
     pkg_check_modules(_pc_poppler poppler-qt6)
     if(_pc_poppler_FOUND)
       set(_pc_poppler_pkgname poppler-qt6)
+      if(NOT "${_pc_poppler_VERSION}" VERSION_GREATER 0.24.0)
+        set(_poppler_version_bad TRUE)
+      endif()
     endif()
   endif()
-  if(_pc_poppler_FOUND)
-    if(NOT "${_pc_poppler_VERSION}" VERSION_GREATER 0.24.0)
-      set(_poppler_version_bad TRUE)
-    endif(NOT "${_pc_poppler_VERSION}" VERSION_GREATER 0.24.0)
-  endif(_pc_poppler_FOUND)
-endif(NOT WIN32)
 
-if(NOT _poppler_version_bad)
-  set(POPPLER_QT5_FOUND FALSE)
+  if(NOT _poppler_version_bad)
+    set(POPPLER_QT6_FOUND FALSE)
 
-  # try library name discovered by pkg-config (poppler-qt6 or poppler-qt6)
-  # Attempt to use pkg-config-provided absolute library path variable if available
-  if(_pc_poppler_FOUND)
-    # construct the variable name pkgcfg_lib__pc_poppler_<pkgname>
-    set(_pkg_var "pkgcfg_lib__pc_poppler_${_pc_poppler_pkgname}")
-    message(STATUS "FindPoppler: pkg-config found ${_pc_poppler_pkgname}, var ${_pkg_var} defined? ${${_pkg_var}}")
-    if(DEFINED ${_pkg_var})
-      set(POPPLER_QT5_LIBRARY ${${_pkg_var}})
-      message(STATUS "FindPoppler: using pkgcfg path ${POPPLER_QT5_LIBRARY}")
+    # Try library name discovered by pkg-config
+    if(_pc_poppler_FOUND)
+      set(_pkg_var "pkgcfg_lib__pc_poppler_${_pc_poppler_pkgname}")
+      message(STATUS "FindPoppler: pkg-config found ${_pc_poppler_pkgname}, var ${_pkg_var} defined? ${${_pkg_var}}")
+      if(DEFINED ${_pkg_var})
+        set(POPPLER_QT6_LIBRARY ${${_pkg_var}})
+        message(STATUS "FindPoppler: using pkgcfg path ${POPPLER_QT6_LIBRARY}")
+      endif()
     endif()
-  endif()
-  if(NOT POPPLER_QT5_LIBRARY)
-    find_library(POPPLER_QT5_LIBRARY ${_pc_poppler_pkgname}
-                 HINTS ${_pc_poppler_LIBRARY_DIRS}
-    )
-  endif()
-  # fallback: try common library names if pkg-config hints didn't help
-  if(NOT POPPLER_QT5_LIBRARY)
-    find_library(POPPLER_QT5_LIBRARY NAMES poppler-qt6 poppler-qt6)
-  endif()
-  # extra fallback paths commonly used on Debian/Ubuntu
-  if(NOT POPPLER_QT5_LIBRARY)
-    find_library(POPPLER_QT5_LIBRARY NAMES poppler-qt6 poppler-qt6 PATHS /usr/lib/x86_64-linux-gnu /usr/lib /usr/local/lib)
-  endif()
-
-  # check for headers for both qt5 and qt6 layouts
-  find_path(POPPLER_QT5_INCLUDE_DIR poppler-qt6.h poppler-qt6.h
-            HINTS ${_pc_poppler_INCLUDE_DIRS}
-            PATH_SUFFIXES poppler/qt5 poppler/qt6
-  )
-  find_path(POPPLER_QT5_INCLUDE_DIR_core qt5/poppler-qt6.h qt6/poppler-qt6.h
-            HINTS ${_pc_poppler_INCLUDE_DIRS}
-            PATH_SUFFIXES poppler
-  )
-
-  if(POPPLER_QT5_LIBRARY AND POPPLER_QT5_INCLUDE_DIR AND POPPLER_QT5_INCLUDE_DIR_core)
-    list(APPEND POPPLER_QT5_INCLUDE_DIR "${POPPLER_QT5_INCLUDE_DIR_core}")
-    set(POPPLER_QT5_FOUND TRUE)
-    # Expose a modern imported target for consumers
-    if(NOT TARGET PopplerQt6::Poppler)
-      add_library(PopplerQt6::Poppler UNKNOWN IMPORTED)
-      set_target_properties(PopplerQt6::Poppler PROPERTIES
-        IMPORTED_LOCATION "${POPPLER_QT5_LIBRARY}"
-        INTERFACE_INCLUDE_DIRECTORIES "${POPPLER_QT5_INCLUDE_DIR}"
+    
+    if(NOT POPPLER_QT6_LIBRARY)
+      find_library(POPPLER_QT6_LIBRARY ${_pc_poppler_pkgname}
+                   HINTS ${_pc_poppler_LIBRARY_DIRS}
       )
     endif()
-    # Also cache the library path so other CMakeLists can link directly
-    set(POPPLER_QT5_LIBRARY "${POPPLER_QT5_LIBRARY}" CACHE FILEPATH "Path to poppler-qt library")
-    set(POPPLER_QT5_INCLUDE_DIR "${POPPLER_QT5_INCLUDE_DIR}" CACHE PATH "Poppler include dirs")
-  endif(POPPLER_QT5_LIBRARY AND POPPLER_QT5_INCLUDE_DIR AND POPPLER_QT5_INCLUDE_DIR_core)
-endif(NOT _poppler_version_bad)
+    
+    # Fallback: try common library names
+    if(NOT POPPLER_QT6_LIBRARY)
+      find_library(POPPLER_QT6_LIBRARY NAMES poppler-qt6 poppler-qt6)
+    endif()
+    
+    # Extra fallback paths
+    if(NOT POPPLER_QT6_LIBRARY)
+      find_library(POPPLER_QT6_LIBRARY NAMES poppler-qt6 poppler-qt6 
+                   PATHS /usr/lib/x86_64-linux-gnu /usr/lib /usr/local/lib)
+    endif()
 
-if(POPPLER_QT5_LIBRARY AND POPPLER_QT5_INCLUDE_DIR)
-  INCLUDE(FindPackageHandleStandardArgs)
-  FIND_PACKAGE_HANDLE_STANDARD_ARGS(PopplerQt6 DEFAULT_MSG
-                                    POPPLER_QT5_LIBRARY
-                                    POPPLER_QT5_INCLUDE_DIR)
-else()
-  # Poppler Qt bindings not found — create placeholder target/variables so projects using FIND_PACKAGE(PopplerQt6 REQUIRED)
-  # do not fail at configure time. Real functionality will require installing poppler-qt6 or updating code.
-  message(WARNING "Poppler Qt bindings not found (poppler-qt6 or poppler-qt6). Creating placeholder PopplerQt6::Poppler target to allow configure.")
-  set(POPPLER_QT5_LIBRARY "" CACHE STRING "Placeholder poppler library" FORCE)
-  set(POPPLER_QT5_INCLUDE_DIR "" CACHE STRING "Placeholder poppler include dir" FORCE)
-  if(NOT TARGET PopplerQt6::Poppler)
-    add_library(PopplerQt6::Poppler UNKNOWN IMPORTED)
-    set_property(TARGET PopplerQt6::Poppler PROPERTY INTERFACE_INCLUDE_DIRECTORIES "")
+    # Check for headers (Qt6 layout: poppler/qt6/poppler-qt6.h)
+    find_path(POPPLER_QT6_INCLUDE_DIR poppler/qt6/poppler-qt6.h
+              HINTS ${_pc_poppler_INCLUDE_DIRS}
+              PATH_SUFFIXES poppler
+    )
+
+    if(POPPLER_QT6_LIBRARY AND POPPLER_QT6_INCLUDE_DIR)
+      set(POPPLER_QT6_FOUND TRUE)
+      
+      # Expose a modern imported target for consumers
+      if(NOT TARGET PopplerQt6::Poppler)
+        add_library(PopplerQt6::Poppler UNKNOWN IMPORTED)
+        set_target_properties(PopplerQt6::Poppler PROPERTIES
+          IMPORTED_LOCATION "${POPPLER_QT6_LIBRARY}"
+          INTERFACE_INCLUDE_DIRECTORIES "${POPPLER_QT6_INCLUDE_DIR}"
+        )
+      endif()
+      
+      # Cache the variables
+      set(POPPLER_QT6_LIBRARY "${POPPLER_QT6_LIBRARY}" CACHE FILEPATH "Path to poppler-qt6 library")
+      set(POPPLER_QT6_INCLUDE_DIR "${POPPLER_QT6_INCLUDE_DIR}" CACHE PATH "Poppler-Qt6 include dirs")
+    endif()
+  endif()
+
+  if(POPPLER_QT6_LIBRARY AND POPPLER_QT6_INCLUDE_DIR)
+    include(FindPackageHandleStandardArgs)
+    find_package_handle_standard_args(PopplerQt6 DEFAULT_MSG
+                                      POPPLER_QT6_LIBRARY
+                                      POPPLER_QT6_INCLUDE_DIR)
+  else()
+    message(WARNING "Poppler Qt6 bindings not found. Creating placeholder PopplerQt6::Poppler target.")
+    set(POPPLER_QT6_LIBRARY "" CACHE STRING "Placeholder poppler library" FORCE)
+    set(POPPLER_QT6_INCLUDE_DIR "" CACHE STRING "Placeholder poppler include dir" FORCE)
+    if(NOT TARGET PopplerQt6::Poppler)
+      add_library(PopplerQt6::Poppler UNKNOWN IMPORTED)
+      set_property(TARGET PopplerQt6::Poppler PROPERTY INTERFACE_INCLUDE_DIRECTORIES "")
+    endif()
+    set(POPPLER_QT6_FOUND TRUE CACHE INTERNAL "Poppler placeholder present")
   endif()
-  set(POPPLER_QT5_FOUND TRUE CACHE INTERNAL "Poppler placeholder present")
 endif()
-endif(POPPLER_QT5_INCLUDE_DIR AND POPPLER_QT5_LIBRARY)