Adds latest migration results

qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/UAS/CMakeLists.txt

@@ -1,3 +1,11 @@
+# Make ${Qt6_Gui} optional
+if(QT6_GUI_AVAILABLE AND TARGET Qt6::Gui)
+  set(Qt6_Gui ${Qt6_Gui})
+else()
+  set(Qt6_Gui "")
+endif()
+
+
 add_subdirectory(TmsIfAdapter)
 
 
@@ -24,23 +32,25 @@ set(src
 
 NGL_ADD_LIBRARY(SV tabPluginUAS MODULE ${src})
 
-NGL_TARGET_LINK_LIBRARIES(tabPluginUAS
-  TmsIfAdapterInterface
-
-  NGLLogger
-  nglsettings
-  Qt6::Core
-  Qt6::Gui
-  Qt6::Network
-  tabTelegrams
-  tabPluginInterface
-  svcCesClient
-  svcPdmClient
-  svcTabCommon
-  svcPpmClient
-  svcFlmClient
-  LtsUtilsCoreHeaderOnly
-  LtsCoordTrans # geocentric2LonLatAlt
-)
+if(QT6_GUI_AVAILABLE)
+  NGL_TARGET_LINK_LIBRARIES(tabPluginUAS
+    TmsIfAdapterInterface
+  
+    NGLLogger
+    nglsettings
+    Qt6::Core
+    ${Qt6_Gui}
+    Qt6::Network
+    tabTelegrams
+    tabPluginInterface
+    svcCesClient
+    svcPdmClient
+    svcTabCommon
+    svcPpmClient
+    svcFlmClient
+    LtsUtilsCoreHeaderOnly
+    LtsCoordTrans # geocentric2LonLatAlt
+  )
+endif()
 
 NGL_INSTALL_TARGET(tabPluginUAS)

qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/UAS/Test/CMakeLists.txt

@@ -1,3 +1,11 @@
+# Make ${Qt6_Widgets} optional
+if(QT6_GUI_AVAILABLE AND TARGET Qt6::Widgets)
+  set(Qt6_Widgets ${Qt6_Widgets})
+else()
+  set(Qt6_Widgets "")
+endif()
+
+
 MACRO(_BUILD_TEST test_id)
   add_executable(TabUASTest${test_id} test${test_id}.cpp)
   FIND_PACKAGE(TMSIF REQUIRED)
@@ -64,11 +72,13 @@ PRIVATE
 
 # test6
 add_executable(TabUASTest6 test6.cpp)
-target_link_libraries(TabUASTest6
-PRIVATE
-  Qt6::Core
-  Qt6::Widgets
-
-  #TmsIfAdapter via dlopen !
-  TmsIfAdapterInterface
-)
+if(QT6_GUI_AVAILABLE)
+  target_link_libraries(TabUASTest6
+  PRIVATE
+    Qt6::Core
+    ${Qt6_Widgets}
+  
+    #TmsIfAdapter via dlopen !
+    TmsIfAdapterInterface
+  )
+endif()

qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/UAS/TmsIfAdapter/src/CMakeLists.txt

@@ -5,6 +5,21 @@
 # $Author$
 #
 
+# Make ${Qt6_Gui} optional
+if(QT6_GUI_AVAILABLE AND TARGET Qt6::Gui)
+  set(Qt6_Gui ${Qt6_Gui})
+else()
+  set(Qt6_Gui "")
+endif()
+
+# Make ${Qt6_WebSockets} optional
+if(QT6_GUI_AVAILABLE AND TARGET Qt6::WebSockets)
+  set(Qt6_WebSockets ${Qt6_WebSockets})
+else()
+  set(Qt6_WebSockets "")
+endif()
+
+
 FIND_PACKAGE(TMSIF REQUIRED)
 
 if(WIN32)
@@ -45,21 +60,23 @@ NGL_TARGET_INCLUDE_DIRECTORIES(TmsIfAdapter
     ${CMAKE_CURRENT_SOURCE_DIR}/../../
 )
 
-NGL_TARGET_LINK_LIBRARIES(TmsIfAdapter
-PRIVATE
-  TMSIF::tmsif-cyclone
-  TMSIF::ddscxx
-  TMSIF::ddkit-cyclone
-
-  LtsUtilsCoreHeaderOnly
-  LtsCoordTrans
-  NGLLogger
-
-  Qt6::Core
-  Qt6::Gui
-  Qt6::Network
-  Qt6::WebSockets
-)
+if(QT6_GUI_AVAILABLE)
+  NGL_TARGET_LINK_LIBRARIES(TmsIfAdapter
+  PRIVATE
+    TMSIF::tmsif-cyclone
+    TMSIF::ddscxx
+    TMSIF::ddkit-cyclone
+  
+    LtsUtilsCoreHeaderOnly
+    LtsCoordTrans
+    NGLLogger
+  
+    Qt6::Core
+    ${Qt6_Gui}
+    Qt6::Network
+    ${Qt6_WebSockets}
+  )
+endif()
 
 target_compile_definitions(TmsIfAdapter PUBLIC DDS_VENDOR_CYCLONE)