Adds latest migration results

qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Symbology/CMakeLists.txt

@@ -6,6 +6,14 @@
 
 # LIBRARY
 
+# Make ${Qt6_Widgets} optional
+if(QT6_GUI_AVAILABLE AND TARGET Qt6::Widgets)
+  set(Qt6_Widgets ${Qt6_Widgets})
+else()
+  set(Qt6_Widgets "")
+endif()
+
+
 SET(Symbology_SRCS
   sidc_codec.cpp
 
@@ -71,22 +79,24 @@ NGL_TARGET_INCLUDE_DIRECTORIES(advancedSymbology
     ${CMAKE_CURRENT_SOURCE_DIR}/..
 )
 
-NGL_TARGET_LINK_LIBRARIES(advancedSymbology
-  PRIVATE
-    ArcGIS::ArcGIS
-    Qt6::Concurrent
-    ngltools # DTG
-    situationMapCommon
-    LtsDataView
-    LtsSessionData
-    LtsUtilsCoreHeaderOnly
-
-  PUBLIC
-    advancedSymbologyXML
-    NGLLogger
-    Qt6::Core
-    Qt6::Widgets
-)
+if(QT6_GUI_AVAILABLE)
+  NGL_TARGET_LINK_LIBRARIES(advancedSymbology
+    PRIVATE
+      ArcGIS::ArcGIS
+      Qt6::Concurrent
+      ngltools # DTG
+      situationMapCommon
+      LtsDataView
+      LtsSessionData
+      LtsUtilsCoreHeaderOnly
+  
+    PUBLIC
+      advancedSymbologyXML
+      NGLLogger
+      Qt6::Core
+      ${Qt6_Widgets}
+  )
+endif()
 
 
 IF(BUILD_TESTING AND BUILD_SITMAP_UNIT_TESTS AND TARGET situationMapCommon)
@@ -100,21 +110,23 @@ IF(BUILD_TESTING AND BUILD_SITMAP_UNIT_TESTS AND TARGET situationMapCommon)
 #  INTERFACE
 #    ${CMAKE_CURRENT_SOURCE_DIR}
   )
-  NGL_TARGET_LINK_LIBRARIES(advancedSymbology_static
-    PRIVATE
-      NGLLogger
-      ArcGIS::ArcGIS
-      Qt6::Concurrent
-    PUBLIC
-      advancedSymbologyXML
-      Qt6::Core
-      Qt6::Widgets
-
-      LtsDataView
-      LtsSessionData
-      LtsUtilsCoreHeaderOnly
-
-  )
+if(QT6_GUI_AVAILABLE)
+    NGL_TARGET_LINK_LIBRARIES(advancedSymbology_static
+      PRIVATE
+        NGLLogger
+        ArcGIS::ArcGIS
+        Qt6::Concurrent
+      PUBLIC
+        advancedSymbologyXML
+        Qt6::Core
+        ${Qt6_Widgets}
+  
+        LtsDataView
+        LtsSessionData
+        LtsUtilsCoreHeaderOnly
+  
+    )
+endif()
 
 ENDIF()
 

qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/SymbologyXML/CMakeLists.txt

@@ -6,6 +6,21 @@
 
 # LIBRARY
 
+# 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()
+
+
 SET(SymbologyXML_SRCS
   attribute_data.h
   symbology_xml_export.h
@@ -42,16 +57,18 @@ NGL_TARGET_INCLUDE_DIRECTORIES(advancedSymbologyXML
      ${CMAKE_CURRENT_SOURCE_DIR}/..
 )
 
-NGL_TARGET_LINK_LIBRARIES(advancedSymbologyXML
-  PRIVATE
-    situationMapCommon
-    Qt6::Gui
-    Qt6::Widgets
-  PUBLIC
-    LtsWidgets
-    NGLLogger
-    Qt6::Core
-)
+if(QT6_GUI_AVAILABLE)
+  NGL_TARGET_LINK_LIBRARIES(advancedSymbologyXML
+    PRIVATE
+      situationMapCommon
+      ${Qt6_Gui}
+      ${Qt6_Widgets}
+    PUBLIC
+      LtsWidgets
+      NGLLogger
+      Qt6::Core
+  )
+endif()
 
 NGL_INSTALL_TARGET(advancedSymbologyXML)
 

qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/SymbologyXML/Gui/CMakeLists.txt

@@ -6,6 +6,14 @@
 
 # LIBRARY
 
+# Make ${Qt6_Gui} optional
+if(QT6_GUI_AVAILABLE AND TARGET Qt6::Gui)
+  set(Qt6_Gui ${Qt6_Gui})
+else()
+  set(Qt6_Gui "")
+endif()
+
+
 SET(SymbologyXML_Gui_SRCS
   symbology_xml_gui_export.h
   symbol_dialog.cpp
@@ -24,18 +32,20 @@ NGL_TARGET_INCLUDE_DIRECTORIES(advancedSymbologyXML_Gui
      ${CMAKE_CURRENT_SOURCE_DIR}/../../../../Common
 )
 
-NGL_TARGET_LINK_LIBRARIES(advancedSymbologyXML_Gui
-  PRIVATE
-    situationMapCommon
-    situationMapGeometryModel
-    advancedSymbology
-    NGLLogger
-    Qt6::Gui
-  PUBLIC
-    LtsWidgets
-    NGLLogger
-    Qt6::Core
-)
+if(QT6_GUI_AVAILABLE)
+  NGL_TARGET_LINK_LIBRARIES(advancedSymbologyXML_Gui
+    PRIVATE
+      situationMapCommon
+      situationMapGeometryModel
+      advancedSymbology
+      NGLLogger
+      ${Qt6_Gui}
+    PUBLIC
+      LtsWidgets
+      NGLLogger
+      Qt6::Core
+  )
+endif()
 
 NGL_INSTALL_TARGET(advancedSymbologyXML_Gui)