From e398f4903dcda5ba501d07481a90fe8db699afba Mon Sep 17 00:00:00 2001
From: twi-devel <torsten.wierschin@life-maps.com>
Date: Sat, 5 Sep 2026 19:45:43 +0200
Subject: [PATCH] Infrastructure fixes in Lts/Services/RoutingServiceNG only

---
 qt6-after/qt6-migrated-legatus/CMakeLists.txt |  2 ++
 .../Lts/DDS/DDSConnector/CMakeLists.txt       |  3 +-
 .../Lts/DDS/QosProfile/CMakeLists.txt         |  2 +-
 .../Services/RoutingServiceNG/CMakeLists.txt  |  7 +++-
 .../include/DDS/Generic/ddsconnector_export.h | 32 +++++++++++++++++++
 5 files changed, 43 insertions(+), 3 deletions(-)
 create mode 100644 qt6-after/qt6-migrated-legatus/include/DDS/Generic/ddsconnector_export.h

diff --git a/qt6-after/qt6-migrated-legatus/CMakeLists.txt b/qt6-after/qt6-migrated-legatus/CMakeLists.txt
index f38150754..d5fe5d307 100755
--- a/qt6-after/qt6-migrated-legatus/CMakeLists.txt
+++ b/qt6-after/qt6-migrated-legatus/CMakeLists.txt
@@ -88,6 +88,8 @@ include_directories(${CMAKE_BINARY_DIR}/Lts/Services/InfrastructureManagement)
 include_directories(${CMAKE_SOURCE_DIR}/Lts/Proxies/GuezNasat)
 include_directories(${CMAKE_SOURCE_DIR}/Lts/DDS)
 include_directories(${CMAKE_SOURCE_DIR}/Lts/DDS/QosProfile)
+include_directories(${CMAKE_SOURCE_DIR}/include/DDS)
+include_directories(${CMAKE_SOURCE_DIR}/include/DDS/Generic)
 include_directories(${CMAKE_SOURCE_DIR}/Lts/Common)
 include_directories(${CMAKE_SOURCE_DIR}/Lts/Common/LtsUtils)
 include_directories(${CMAKE_BINARY_DIR}/Lts/Common/LtsUtils/LtsUtilsCore)
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 03da49bb1..4a9c52b7f 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/DDS/DDSConnector/CMakeLists.txt
+++ b/qt6-after/qt6-migrated-legatus/Lts/DDS/DDSConnector/CMakeLists.txt
@@ -19,9 +19,10 @@ SET(SRCS
 )
 
 NGL_ADD_LIBRARY2(AAR SV WS HLA ddsconnector SHARED ${SRCS})
-NGL_TARGET_INCLUDE_DIRECTORIES(
+NGL_TARGET_INCLUDE_DIRECTORIES(ddsconnector
   INTERFACE
     ${CMAKE_CURRENT_SOURCE_DIR}/../../
+    ${CMAKE_SOURCE_DIR}
 )
 NGL_TARGET_LINK_LIBRARIES(ddsconnector
   PRIVATE
diff --git a/qt6-after/qt6-migrated-legatus/Lts/DDS/QosProfile/CMakeLists.txt b/qt6-after/qt6-migrated-legatus/Lts/DDS/QosProfile/CMakeLists.txt
index 3f9de4581..1bb749af5 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/DDS/QosProfile/CMakeLists.txt
+++ b/qt6-after/qt6-migrated-legatus/Lts/DDS/QosProfile/CMakeLists.txt
@@ -24,7 +24,7 @@ ENDIF()
 NGL_ADD_LIBRARY2(AAR SV HLA WS ddsQoS SHARED ${SRCS})
 NGL_TARGET_INCLUDE_DIRECTORIES(ddsQoS
   INTERFACE
-    ${CMAKE_CURRENT_SOURCE_DIR}/../../
+    ${CMAKE_CURRENT_SOURCE_DIR}/../../../
 )
 NGL_TARGET_LINK_LIBRARIES(ddsQoS
   PRIVATE
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 2ca05a5f5..feaaf219b 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Services/RoutingServiceNG/CMakeLists.txt
+++ b/qt6-after/qt6-migrated-legatus/Lts/Services/RoutingServiceNG/CMakeLists.txt
@@ -6,6 +6,9 @@
 
 SET(xml_FILE rsc_service.xml)
 
+# RoutingServiceNG requires RTI DDS - only build when BUILD_RTI=ON
+IF(BUILD_RTI)
+
 SET(SRCS_lib
   logger.cpp
   logger.h
@@ -23,11 +26,13 @@ NGL_TARGET_LINK_LIBRARIES(rscCommon
   PRIVATE
     LtsPluginLoader
   PUBLIC
-    $<IF:$<TARGET_EXISTS:ddsconnector>,ddsconnector,>
+    ddsconnector
     NGLLogger
     Qt6::Core
 )
 
+ENDIF(BUILD_RTI)
+
 ## currently no ruting service in guez
 #IF (NOT GUEZ_MODE)#
 
diff --git a/qt6-after/qt6-migrated-legatus/include/DDS/Generic/ddsconnector_export.h b/qt6-after/qt6-migrated-legatus/include/DDS/Generic/ddsconnector_export.h
new file mode 100644
index 000000000..e542f867e
--- /dev/null
+++ b/qt6-after/qt6-migrated-legatus/include/DDS/Generic/ddsconnector_export.h
@@ -0,0 +1,32 @@
+#pragma once
+
+// Stub header for BUILD_RTI=OFF
+// Original ddsconnector_export.h is generated by CMake when BUILD_RTI=ON
+
+// For BUILD_RTI=OFF, we don't need DLL export/import macros
+// Define DDSCONNECTOR_EXPORT as empty
+#ifndef DDSCONNECTOR_EXPORT
+#define DDSCONNECTOR_EXPORT
+#endif
+
+#ifndef DDSCONNECTOR_NO_EXPORT
+#define DDSCONNECTOR_NO_EXPORT
+#endif
+
+// Static library marker (not used for BUILD_RTI=OFF)
+#ifndef DDSCONNECTOR_STATIC_DEFINE
+#define DDSCONNECTOR_STATIC_DEFINE
+#endif
+
+// Deprecated marker (optional, can be empty)
+#ifndef DDSCONNECTOR_DEPRECATED
+#define DDSCONNECTOR_DEPRECATED
+#endif
+
+#ifndef DDSCONNECTOR_DEPRECATED_EXPORT
+#define DDSCONNECTOR_DEPRECATED_EXPORT DDSCONNECTOR_DEPRECATED DDSCONNECTOR_EXPORT
+#endif
+
+#ifndef DDSCONNECTOR_DEPRECATED_NO_EXPORT
+#define DDSCONNECTOR_DEPRECATED_NO_EXPORT DDSCONNECTOR_DEPRECATED DDSCONNECTOR_NO_EXPORT
+#endif
\ No newline at end of file