Adds latest migration results

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

@@ -6,6 +6,14 @@
 # Created by Mike Wille, SLSE, 2016-08-24
 #
 
+# Make ${Qt6_Gui} optional
+if(QT6_GUI_AVAILABLE AND TARGET Qt6::Gui)
+  set(Qt6_Gui ${Qt6_Gui})
+else()
+  set(Qt6_Gui "")
+endif()
+
+
 ADD_SUBDIRECTORY(Data)
 ADD_SUBDIRECTORY(Gui)
 ADD_SUBDIRECTORY(Shared)
@@ -42,20 +50,24 @@ IF(TARGET IsmShared)
   ADD_DEPENDENCIES(IsmDataPluginInterface IsmShared)
 ENDIF()
 IF(BUILD_RTI)
-NGL_TARGET_LINK_LIBRARIES(IsmDataPluginInterface
-  Qt6::Core
-  Qt6::Gui
-  svcIsmCommon
-  DataPluginInterface
-  IsmShared
-)
+if(QT6_GUI_AVAILABLE)
+  NGL_TARGET_LINK_LIBRARIES(IsmDataPluginInterface
+    Qt6::Core
+    ${Qt6_Gui}
+    svcIsmCommon
+    DataPluginInterface
+    IsmShared
+  )
+endif()
 ELSE()
-NGL_TARGET_LINK_LIBRARIES(IsmDataPluginInterface
-  Qt6::Core
-  Qt6::Gui
-  DataPluginInterface
-  IsmShared
-)
+if(QT6_GUI_AVAILABLE)
+  NGL_TARGET_LINK_LIBRARIES(IsmDataPluginInterface
+    Qt6::Core
+    ${Qt6_Gui}
+    DataPluginInterface
+    IsmShared
+  )
+endif()
 ENDIF(BUILD_RTI)
 NGL_INSTALL_TARGET(IsmDataPluginInterface)
 

qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/Gui/IsmComboBox/CMakeLists.txt

@@ -5,6 +5,14 @@
 # Created by Mike Wille, SLSE, 2016-05-05
 #
 
+# Make ${Qt6_Widgets} optional
+if(QT6_GUI_AVAILABLE AND TARGET Qt6::Widgets)
+  set(Qt6_Widgets ${Qt6_Widgets})
+else()
+  set(Qt6_Widgets "")
+endif()
+
+
 SET(ism_combobox_gui_SRCS
   ism_combobox_gui_plugin.cpp
   ism_combobox_gui_plugin.h
@@ -16,14 +24,16 @@ NGL_WRAP_UI(ism_combobox_gui_SRCS
   )
 
 NGL_ADD_LIBRARY(WS IsmComboBoxGuiPlugin MODULE ${ism_combobox_gui_SRCS})
-NGL_TARGET_LINK_LIBRARIES(IsmComboBoxGuiPlugin
-  NGLLogger
-  IsmGuiComboboxPluginInterface
-  IsmDataPluginInterface
-  Qt6::Widgets
-  LtsWidgets
-  LtsSession
-)
+if(QT6_GUI_AVAILABLE)
+  NGL_TARGET_LINK_LIBRARIES(IsmComboBoxGuiPlugin
+    NGLLogger
+    IsmGuiComboboxPluginInterface
+    IsmDataPluginInterface
+    ${Qt6_Widgets}
+    LtsWidgets
+    LtsSession
+  )
+endif()
 
 NGL_INSTALL_TARGET(IsmComboBoxGuiPlugin)
 

qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/Gui/ResourceManagement/CMakeLists.txt

@@ -6,6 +6,14 @@
 # Created by Mike Wille, SLSE, 2016-10-28
 #
 
+# Make ${Qt6_Widgets} optional
+if(QT6_GUI_AVAILABLE AND TARGET Qt6::Widgets)
+  set(Qt6_Widgets ${Qt6_Widgets})
+else()
+  set(Qt6_Widgets "")
+endif()
+
+
 SET(src
   ExerciseAssignment/ism_exercise_assignment_dialog.cpp
   ExerciseAssignment/ism_exercise_assignment_dialog_model.cpp
@@ -92,34 +100,36 @@ NGL_WRAP_UI(src
 )
 
 NGL_ADD_LIBRARY(WS IsmResGuiPlugin MODULE ${src})
-NGL_TARGET_LINK_LIBRARIES(IsmResGuiPlugin
-  LtsPrinting
-  NGLLogger
-  nglwidgets
-  ngltools
-  LtsSession
-  LtsSessionData
-  LtsNotification
-  AvmDataPluginInterface
-  IsmResGuiPluginInterface
-  IsmDataPluginInterface
-  IsmShared
-  Qt6::Widgets
-  LtsWidgets
-  LtsDataView
-  LtsUtilsCore # json
-  LtsUtilsGuiDds
-  LtsCoordTrans
-  ltsCoordWidget
-  SituationMapGuiPluginInterface
-  situationMap
-  LtsUtilsGuiConnectDialog
-  LtsUtilsSettings
-  #LtsTimeline
-  LtsSessionDataDds
-  ExmDataPluginInterface
-  CmoDataPluginInterface
-)
+if(QT6_GUI_AVAILABLE)
+  NGL_TARGET_LINK_LIBRARIES(IsmResGuiPlugin
+    LtsPrinting
+    NGLLogger
+    nglwidgets
+    ngltools
+    LtsSession
+    LtsSessionData
+    LtsNotification
+    AvmDataPluginInterface
+    IsmResGuiPluginInterface
+    IsmDataPluginInterface
+    IsmShared
+    ${Qt6_Widgets}
+    LtsWidgets
+    LtsDataView
+    LtsUtilsCore # json
+    LtsUtilsGuiDds
+    LtsCoordTrans
+    ltsCoordWidget
+    SituationMapGuiPluginInterface
+    situationMap
+    LtsUtilsGuiConnectDialog
+    LtsUtilsSettings
+    #LtsTimeline
+    LtsSessionDataDds
+    ExmDataPluginInterface
+    CmoDataPluginInterface
+  )
+endif()
 
 NGL_INSTALL_TARGET(IsmResGuiPlugin)
 

qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/Shared/CMakeLists.txt

@@ -10,6 +10,14 @@
 #
 # Shared Tools for Ism Plugins & Foreign Plugins
 #
+# 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 IsmShared SHARED ism_mounting_point.cpp)
 NGL_TARGET_LINK_LIBRARIES(IsmShared
   Qt6::Core