Adds latest migration results

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

@@ -4,6 +4,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_Widgets} optional
+if(QT6_GUI_AVAILABLE AND TARGET Qt6::Widgets)
+  set(Qt6_Widgets ${Qt6_Widgets})
+else()
+  set(Qt6_Widgets "")
+endif()
+
+
 INCLUDE(MacroRTIDDSGen)
 INCLUDE(MacroCodeGenIdl)
 
@@ -82,24 +97,26 @@ NGL_TARGET_INCLUDE_DIRECTORIES(svcAesCommon
     ${CMAKE_CURRENT_SOURCE_DIR}/../
     ${CMAKE_CURRENT_BINARY_DIR}/../
 )
-NGL_TARGET_LINK_LIBRARIES(svcAesCommon
-  PRIVATE
-    RTI::nddscpp2
-    LtsCoordTrans
-  PUBLIC
-    Qt6::Core
-    Qt6::Gui
-    Qt6::Xml
-    $<IF:$<TARGET_EXISTS:ddscore>,ddscore,>
-    $<IF:$<TARGET_EXISTS:svcPdmCommon>,svcPdmCommon,>
-    svcPpmCommon
-    NGLLogger
-    nglsettings
-    ngltools
-    situationMapElevationMap
-    Trajectory
-    ngldb
-)
+if(QT6_GUI_AVAILABLE)
+  NGL_TARGET_LINK_LIBRARIES(svcAesCommon
+    PRIVATE
+      RTI::nddscpp2
+      LtsCoordTrans
+    PUBLIC
+      Qt6::Core
+      ${Qt6_Gui}
+      Qt6::Xml
+      $<IF:$<TARGET_EXISTS:ddscore>,ddscore,>
+      $<IF:$<TARGET_EXISTS:svcPdmCommon>,svcPdmCommon,>
+      svcPpmCommon
+      NGLLogger
+      nglsettings
+      ngltools
+      situationMapElevationMap
+      Trajectory
+      ngldb
+  )
+endif()
 NGL_INSTALL_TARGET(svcAesCommon)
 
 #
@@ -332,33 +349,35 @@ ENDIF()
 
 NGL_ADD_SVC_ICON(SRCS_exe)
 NGL_ADD_EXECUTABLE(AAR SV svcAreaEffectSimulation ${SRCS_exe})
-NGL_TARGET_LINK_LIBRARIES(svcAreaEffectSimulation
-  svcAesServer
-  svcCesClient
-  svcCoreClient
-  svcMdmClient
-  svcPdmClient
-  svcPpmClient
-  svcTabClient
-  $<IF:$<TARGET_EXISTS:svcIsmClient>,svcIsmClient,>
-  svcExmClient
-  svcAsmClient
-  Qt6::Core
-  Qt6::Gui        # QVector3D
-  RTI::nddscpp2
-  nglsettings
-  ProjectConfig
-  LtsCommandLineParser
-  LtsCoordTrans
-  LtsUtilsCore
-  LtsUtilsDds
-  LtsElevation
-  NGLLogger
-  nglcoreapplication
-  $<IF:$<TARGET_EXISTS:ddsconnector>,ddsconnector,>
-  ngltools
-  saaTelegrams
-)
+if(QT6_GUI_AVAILABLE)
+  NGL_TARGET_LINK_LIBRARIES(svcAreaEffectSimulation
+    svcAesServer
+    svcCesClient
+    svcCoreClient
+    svcMdmClient
+    svcPdmClient
+    svcPpmClient
+    svcTabClient
+    $<IF:$<TARGET_EXISTS:svcIsmClient>,svcIsmClient,>
+    svcExmClient
+    svcAsmClient
+    Qt6::Core
+    ${Qt6_Gui}        # QVector3D
+    RTI::nddscpp2
+    nglsettings
+    ProjectConfig
+    LtsCommandLineParser
+    LtsCoordTrans
+    LtsUtilsCore
+    LtsUtilsDds
+    LtsElevation
+    NGLLogger
+    nglcoreapplication
+    $<IF:$<TARGET_EXISTS:ddsconnector>,ddsconnector,>
+    ngltools
+    saaTelegrams
+  )
+endif()
 NGL_INSTALL_TARGET(svcAreaEffectSimulation)
 NGL_INSTALL(AAR SV FILES log4cxx_aes.props DESTINATION bin)
 NGL_ADD_TARGET_LINK(svcAreaEffectSimulation sAES)
@@ -416,16 +435,18 @@ NGL_ADD_EXECUTABLE(AAR SV NO_TRANSLATION aes_utils_test
   Utils/test_main.cpp
 )
 
-NGL_TARGET_LINK_LIBRARIES(aes_utils_test
-  Qt6::Core
-  Qt6::Widgets
-  RTI::nddscpp2
-  svcAesCommon
-  ProjectConfig
-  $<IF:$<TARGET_EXISTS:ddsconnector>,ddsconnector,>
-  nglapplication
-  LtsCoordTrans
-)
+if(QT6_GUI_AVAILABLE)
+  NGL_TARGET_LINK_LIBRARIES(aes_utils_test
+    Qt6::Core
+    ${Qt6_Widgets}
+    RTI::nddscpp2
+    svcAesCommon
+    ProjectConfig
+    $<IF:$<TARGET_EXISTS:ddsconnector>,ddsconnector,>
+    nglapplication
+    LtsCoordTrans
+  )
+endif()
 NGL_INSTALL(AAR SV TARGETS aes_utils_test DESTINATION bin/test)
 
 #
@@ -435,20 +456,22 @@ NGL_ADD_EXECUTABLE(SV NO_TRANSLATION aes_convert_mine_area
   ModuleTests/aes_convert_mine_area.cpp
 )
 
-NGL_TARGET_LINK_LIBRARIES(aes_convert_mine_area
-  Qt6::Core
-#  Qt6::Widgets
-#  RTI::nddscpp2
-  svcAesServer
-  ProjectConfig
-#  nglapplication
-  LtsCoordTrans
-  ngldb
-  LtsCommandLineParser
-  nglcoreapplication
-  nglsettings
-  ngltools
-)
+if(QT6_GUI_AVAILABLE)
+  NGL_TARGET_LINK_LIBRARIES(aes_convert_mine_area
+    Qt6::Core
+  #  ${Qt6_Widgets}
+  #  RTI::nddscpp2
+    svcAesServer
+    ProjectConfig
+  #  nglapplication
+    LtsCoordTrans
+    ngldb
+    LtsCommandLineParser
+    nglcoreapplication
+    nglsettings
+    ngltools
+  )
+endif()
 NGL_INSTALL(SV TARGETS aes_convert_mine_area  DESTINATION bin/test)
 
 

qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/Trajectory/CMakeLists.txt

@@ -5,6 +5,14 @@
 # $Author$
 #
 
+# Make ${Qt6_Gui} optional
+if(QT6_GUI_AVAILABLE AND TARGET Qt6::Gui)
+  set(Qt6_Gui ${Qt6_Gui})
+else()
+  set(Qt6_Gui "")
+endif()
+
+
 NGL_ADD_LIBRARY2(WS SV HLA Trajectory SHARED
   trajectory_generator.cpp
   trajectory_generator.h
@@ -22,17 +30,19 @@ NGL_TARGET_INCLUDE_DIRECTORIES(Trajectory
   INTERFACE
     ${CMAKE_CURRENT_SOURCE_DIR}/../
 )
-NGL_TARGET_LINK_LIBRARIES(Trajectory
-  PRIVATE
-    NGLLogger
-    AsmDataPluginInterface
-    ExmDataPluginInterface
-  PUBLIC
-    LtsElevation
-    LtsUtilsCore
-    LtsCoordTrans
-    Qt6::Core
-    Qt6::Gui
-)
+if(QT6_GUI_AVAILABLE)
+  NGL_TARGET_LINK_LIBRARIES(Trajectory
+    PRIVATE
+      NGLLogger
+      AsmDataPluginInterface
+      ExmDataPluginInterface
+    PUBLIC
+      LtsElevation
+      LtsUtilsCore
+      LtsCoordTrans
+      Qt6::Core
+      ${Qt6_Gui}
+  )
+endif()
 
 ADD_SUBDIRECTORY(UnitTest_Trajectory)

qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/Trajectory/UnitTest_Trajectory/CMakeLists.txt

@@ -5,6 +5,14 @@
 # $Author$
 #
 
+# Make ${Qt6_Gui} optional
+if(QT6_GUI_AVAILABLE AND TARGET Qt6::Gui)
+  set(Qt6_Gui ${Qt6_Gui})
+else()
+  set(Qt6_Gui "")
+endif()
+
+
 SET(LinkedSources
   log4cxxTrajectoryUnitTest.props
 )
@@ -22,7 +30,7 @@ IF(BUILD_TESTING)
      nglcoreapplication
      svcAesCommon
      Qt6::Core
-     Qt6::Gui
+     ${Qt6_Gui}
      Qt6::Test)
 
  ADD_TEST(NAME aesUnitTestTrajectory COMMAND $<TARGET_FILE:aesUnitTestTrajectory>)