Infrastructure fixes in Lts/Services/RoutingServiceNG only

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)

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

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

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

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