Adds latest migration results

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

@@ -7,6 +7,14 @@
   # Created by Julius Ewert, ESIM, 2024-03-20
   #
 
+# Make ${Qt6_WebSockets} optional
+if(QT6_GUI_AVAILABLE AND TARGET Qt6::WebSockets)
+  set(Qt6_WebSockets ${Qt6_WebSockets})
+else()
+  set(Qt6_WebSockets "")
+endif()
+
+
   SET(SRCS_SAA
   telegrams.h
   telegrams.cpp
@@ -26,7 +34,7 @@ NGL_TARGET_INCLUDE_DIRECTORIES(saaTelegrams
 NGL_TARGET_LINK_LIBRARIES(saaTelegrams
 #  svcPdmClient  # Externe Dependency - nicht verfügbar
   Qt6::Core
-  Qt6::WebSockets
+  ${Qt6_WebSockets}
 )
 
 SET(SRCS
@@ -74,7 +82,7 @@ NGL_TARGET_LINK_LIBRARIES(tabPluginAdler
   ngltools
   Qt6::Core
   Qt6::Network
-  Qt6::WebSockets
+  ${Qt6_WebSockets}
   tabPluginInterface
   OpmDataPluginInterface
   tabTelegrams

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

@@ -5,6 +5,14 @@
 # $Author: fritsche_h $
 #
 
+# Make ${Qt6_WebSockets} optional
+if(QT6_GUI_AVAILABLE AND TARGET Qt6::WebSockets)
+  set(Qt6_WebSockets ${Qt6_WebSockets})
+else()
+  set(Qt6_WebSockets "")
+endif()
+
+
 SET(UnitTestSources
   test_telegram_decoding.cpp
   ex_anmeldung.cpp
@@ -69,7 +77,7 @@ ADD_EXECUTABLE(tabModuleTestAdler ${LinkedSources} ${UnitTestSources}
      nglapplication
      saaTelegrams
      Qt6::Network
-     Qt6::WebSockets
+     ${Qt6_WebSockets}
      Qt6::Test
    )
 

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

@@ -5,6 +5,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
   logger.cpp
   logger.h
@@ -39,7 +47,7 @@ NGL_TARGET_LINK_LIBRARIES(tabPluginApHla
   ngltools
   Qt6::Core
   Qt6::Network
-  Qt6::WebSockets
+  ${Qt6_WebSockets}
   tabPluginInterface
   tabTelegrams
   svcTabCommon

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

@@ -5,6 +5,14 @@
 # $Author$
 #
 
+# Make ${Qt6_WebSockets} optional
+if(QT6_GUI_AVAILABLE AND TARGET Qt6::WebSockets)
+  set(Qt6_WebSockets ${Qt6_WebSockets})
+else()
+  set(Qt6_WebSockets "")
+endif()
+
+
 ADD_SUBDIRECTORY(XDR_QtHandler)
 
 SET(SRCS
@@ -27,7 +35,7 @@ NGL_TARGET_LINK_LIBRARIES(tabPluginDebugJsonDir
   NGLLogger
   nglsettings
   Qt6::Core
-  Qt6::WebSockets
+  ${Qt6_WebSockets}
   tabPluginInterface
   xdr_qthandler_dir
 )

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

@@ -5,6 +5,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
   logger.cpp
   logger.h
@@ -29,7 +37,7 @@ NGL_TARGET_LINK_LIBRARIES(tabPluginHla
   nglsettings
   Qt6::Core
   Qt6::Network
-  Qt6::WebSockets
+  ${Qt6_WebSockets}
   tabPluginInterface
   tabTelegrams
 )

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

@@ -5,6 +5,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
   logger.cpp
   logger.h
@@ -33,7 +41,7 @@ NGL_TARGET_LINK_LIBRARIES(tabPluginNmea
   Qt6::Core
   Qt6::Network
   Qt6::Sql
-  Qt6::WebSockets
+  ${Qt6_WebSockets}
   tabPluginInterface
   tabTelegrams
 )

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

@@ -5,6 +5,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
   convert_from_json.cpp
   convert_from_json.h
@@ -29,7 +37,7 @@ NGL_TARGET_LINK_LIBRARIES(tabPluginTetraJson
   Qt6::Core
   Qt6::Network
   Qt6::Sql
-  Qt6::WebSockets
+  ${Qt6_WebSockets}
   tabPluginInterface
   tabTelegrams
   PrtCnvLib

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)
 

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

@@ -5,6 +5,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
   logger.cpp
   logger.h
@@ -42,7 +50,7 @@ NGL_TARGET_LINK_LIBRARIES(tabPluginWlsTetra
   Qt6::Core
   Qt6::Network
   Qt6::Sql
-  Qt6::WebSockets
+  ${Qt6_WebSockets}
   tabPluginInterface
   tabTelegrams
 )