Adds latest migration results

qt6-after/qt6-migrated-legatus/Lts/Services/InfrastructureManagement/CMakeLists.txt

@@ -5,6 +5,14 @@
 #
 
 
+# Make ${Qt6_Gui} optional
+if(QT6_GUI_AVAILABLE AND TARGET Qt6::Gui)
+  set(Qt6_Gui ${Qt6_Gui})
+else()
+  set(Qt6_Gui "")
+endif()
+
+
 INCLUDE(MacroRTIDDSGen)
 INCLUDE(MacroCodeGenIdl)
 
@@ -85,17 +93,19 @@ NGL_TARGET_INCLUDE_DIRECTORIES(svcIsmClient
     ${CMAKE_CURRENT_BINARY_DIR}/../
 )
 
-NGL_TARGET_LINK_LIBRARIES(svcIsmClient
-  PRIVATE
-    RTI::nddscpp2
-    $<IF:$<TARGET_EXISTS:ddsconnector>,ddsconnector,>
-    Qt6::Xml
-  PUBLIC
-    svcIsmCommon
-    ddsftc
-    LtsCoordTrans
-    Qt6::Gui
-)
+if(QT6_GUI_AVAILABLE)
+  NGL_TARGET_LINK_LIBRARIES(svcIsmClient
+    PRIVATE
+      RTI::nddscpp2
+      $<IF:$<TARGET_EXISTS:ddsconnector>,ddsconnector,>
+      Qt6::Xml
+    PUBLIC
+      svcIsmCommon
+      ddsftc
+      LtsCoordTrans
+      ${Qt6_Gui}
+  )
+endif()
 NGL_INSTALL_TARGET(svcIsmClient)
 
 #
@@ -201,25 +211,27 @@ ENDIF()
 
 NGL_ADD_SVC_ICON(SRCS_exe)
 NGL_ADD_EXECUTABLE(AAR SV svcInfrastructureManagement ${SRCS_exe})
-NGL_TARGET_LINK_LIBRARIES(svcInfrastructureManagement
-  Qt6::Core
-  Qt6::Xml
-  Qt6::Gui
-  svcCoreClient
-  svcIsmCommon
-  svcIsmServer
-  $<IF:$<TARGET_EXISTS:ddsconnector>,ddsconnector,>
-  nglsettings
-  ProjectConfig
-  LtsCommandLineParser
-  NGLLogger
-  nglcoreapplication
-  LtsCoordTrans
-  LtsWebSocketServer
-  svcAsmClient
-  svcExmClient
-  ngltools  
-)
+if(QT6_GUI_AVAILABLE)
+  NGL_TARGET_LINK_LIBRARIES(svcInfrastructureManagement
+    Qt6::Core
+    Qt6::Xml
+    ${Qt6_Gui}
+    svcCoreClient
+    svcIsmCommon
+    svcIsmServer
+    $<IF:$<TARGET_EXISTS:ddsconnector>,ddsconnector,>
+    nglsettings
+    ProjectConfig
+    LtsCommandLineParser
+    NGLLogger
+    nglcoreapplication
+    LtsCoordTrans
+    LtsWebSocketServer
+    svcAsmClient
+    svcExmClient
+    ngltools  
+  )
+endif()
 NGL_INSTALL_TARGET(svcInfrastructureManagement)
 NGL_INSTALL(AAR SV FILES log4cxx_ism.props DESTINATION bin)
 NGL_ADD_TARGET_LINK(svcInfrastructureManagement sISM)

qt6-after/qt6-migrated-legatus/Lts/Services/InfrastructureManagement/ImportBuildings/CMakeLists.txt

@@ -4,6 +4,14 @@
 # $Author$
 #
 
+# Make ${Qt6_WebSockets} optional
+if(QT6_GUI_AVAILABLE AND TARGET Qt6::WebSockets)
+  set(Qt6_WebSockets ${Qt6_WebSockets})
+else()
+  set(Qt6_WebSockets "")
+endif()
+
+
 SET(SRCS_IMPORT_BUILDINGS
   ism_import_buildings.cpp
   ism_import_buildings.h
@@ -17,7 +25,7 @@ NGL_TARGET_LINK_LIBRARIES(ismImportBuildings
   $<IF:$<TARGET_EXISTS:ddsconnector>,ddsconnector,>
   nglcoreapplication
   LtsUtilsCoreHeaderOnly
-  Qt6::WebSockets
+  ${Qt6_WebSockets}
 )
 NGL_INSTALL_TARGET(ismImportBuildings)