Add BUILD_RTI conditionals for RTI/DDS dependent libraries

Systematic fix for BUILD_RTI conditional compilation: - Lts/Common: Wrap all DDS-dependent libraries in IF(BUILD_RTI) - LtsAppManager, LtsCoordTrans, LtsCoordinate, LtsLogin - LtsMultiMonitor, LtsPluginManager, LtsPrinting - LtsProjectionWorkstation, LtsScriptTimeline, LtsSession - LtsTimelineClassic, LtsUtilsCore, LtsUtilsGui, LtsUtilsGuiDds - Lts/DDS: Add BUILD_RTI guards to Core, DDSConnector, DdsUnitTests, FTC, FTS - Lts/Plugins: Add BUILD_RTI guards to FilterManagement, OperatorManagement, SituationReplayManagement - Lts/Proxies: Add BUILD_RTI guards to Buildings, CombatNetRadio, ComponentMonitor, GuezNasat, TrainingAreaBase, TrainingAreaBaseOC - Lts/Services: Add BUILD_RTI guards to all 30+ service modules - Z/nglwidgets: Add BUILD_RTI guards, fix Poppler Qt6 headers Qt6 compatibility fixes: - LtsCoordTrans: QOverload signal signature, QChar constructor - LtsMultiMonitor: setMargin→setContentsMargins, remove deprecated HighQualityAntialiasing - nglwidgets: Poppler Qt5→Qt6 header migration - Add FindPopplerQt6.cmake for Qt6 Poppler detection Part of Qt5→Qt6 migration with RTI DDS support.
2026-08-19 00:12:28 +02:00
1 parent 514ded2739
commit cf6d77c030
@@ -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()
@@ -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)
@@ -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)
@@ -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))
@@ -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)
@@ -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)
@@ -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)
@@ -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);


  
@@ -242,7 +242,6 @@ void MultiMonitorSelectorWide::paintEvent(QPaintEvent *)
  p.save();

  p.setRenderHint(QPainter::Antialiasing, true);
-  p.setRenderHint(QPainter::HighQualityAntialiasing, true);

  const QRect centered(centeredRect()); 

@@ -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); 

@@ -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);
@@ -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); 

@@ -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)
@@ -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()
@@ -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)
@@ -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)
@@ -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)
@@ -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)

@@ -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
@@ -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)
@@ -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)
@@ -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)

 #
@@ -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
@@ -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}/../
@@ -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)
@@ -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
@@ -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
@@ -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)

@@ -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)

@@ -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)

 #
@@ -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)
@@ -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)

 #
@@ -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)

 #
@@ -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)

 #
@@ -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)

 #
@@ -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)

 #
@@ -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)

 #
@@ -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)

 #
@@ -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)

 #
@@ -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)


@@ -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)

@@ -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)

 #
@@ -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)

 #
@@ -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)

 #
@@ -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)

 #
@@ -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)

 #
@@ -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)

 #
@@ -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)

 #
@@ -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)

 #
@@ -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)

 #
@@ -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)

 #
@@ -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)

 #
@@ -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)

 #
@@ -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)

 #
@@ -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)

 #
@@ -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)

 #
@@ -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)

 #
@@ -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)

 #
@@ -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)

 #
@@ -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)

 #
@@ -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)

 #
@@ -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)

 #
@@ -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)

 #
@@ -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)

 #
@@ -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)

 #
@@ -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)
@@ -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)

 #
@@ -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)

 #
@@ -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)
@@ -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)

 #
@@ -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)

 #
@@ -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)
@@ -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)

 #
@@ -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)

 #
@@ -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
@@ -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"

@@ -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>

@@ -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)