Adds latest migration results

qt6-after/qt6-migrated-legatus/Lts/Plugins/BuildingViewer/Common/CMakeLists.txt

@@ -6,6 +6,21 @@
 # Created by Mike Wille, SLSE, 2017-08-17
 #
 
+# 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()
+
+
 FIND_PACKAGE(BgViewer)
 IF (BgViewer_FOUND)
   SET(BgViewer_FOUND TRUE)
@@ -94,15 +109,17 @@ INSTALL_SHARED_FILES(BuildingViewerCommon_SRCS
 )
 
 NGL_ADD_LIBRARY2(WS BuildingViewerCommon SHARED ${BuildingViewerCommon_SRCS})
-NGL_TARGET_LINK_LIBRARIES(BuildingViewerCommon
-  PRIVATE
-    Qt6::OpenGL
-    ${OPENGL_LIBRARIES}
-    ${BGVIEWER_DTENTITYOSG_LIBRARY}
-    ${BGVIEWER_DTENTITY_LIBRARY}
-    ${OPENTHREADS_LIBRARIES} # FIND_PACKAGE(OpenSceneGraph)
-    ${OPENSCENEGRAPH_LIBRARIES} # FIND_PACKAGE(OpenSceneGraph)
-)
+if(QT6_GUI_AVAILABLE)
+  NGL_TARGET_LINK_LIBRARIES(BuildingViewerCommon
+    PRIVATE
+      Qt6::OpenGL
+      ${OPENGL_LIBRARIES}
+      ${BGVIEWER_DTENTITYOSG_LIBRARY}
+      ${BGVIEWER_DTENTITY_LIBRARY}
+      ${OPENTHREADS_LIBRARIES} # FIND_PACKAGE(OpenSceneGraph)
+      ${OPENSCENEGRAPH_LIBRARIES} # FIND_PACKAGE(OpenSceneGraph)
+  )
+endif()
 NGL_TARGET_INCLUDE_DIRECTORIES(BuildingViewerCommon
   PRIVATE
     ${CMAKE_CURRENT_SOURCE_DIR}/BgViewer/dtEntity/ext/RapidXML
@@ -132,30 +149,32 @@ NGL_TARGET_INCLUDE_DIRECTORIES(BuildingViewerCommon
     ${CMAKE_CURRENT_BINARY_DIR}/../
 )
 
-NGL_TARGET_LINK_LIBRARIES(BuildingViewerCommon
-  PRIVATE
-    ngltools
-    LtsPluginManager
-  PUBLIC
-    Qt6::Core
-    Qt6::Gui
-    Qt6::Widgets
-    AsbDataPluginInterface
-    AvmDataPluginInterface
-    BldDataPluginInterface
-    AesDataPluginInterface
-    SrpDataPluginInterface
-    IsmDataPluginInterface
-    PpmDataPluginInterface
-    PpmParticipantInfoGuiPluginInterface
-    IsmShared
-    LtsAppManager
-    LtsCoordTrans
-    LtsSessionData
-    LtsSession
-    LtsWidgets
-    LtsUtilsSettings
-    LtsUtilsGuiDds
-)
+if(QT6_GUI_AVAILABLE)
+  NGL_TARGET_LINK_LIBRARIES(BuildingViewerCommon
+    PRIVATE
+      ngltools
+      LtsPluginManager
+    PUBLIC
+      Qt6::Core
+      ${Qt6_Gui}
+      ${Qt6_Widgets}
+      AsbDataPluginInterface
+      AvmDataPluginInterface
+      BldDataPluginInterface
+      AesDataPluginInterface
+      SrpDataPluginInterface
+      IsmDataPluginInterface
+      PpmDataPluginInterface
+      PpmParticipantInfoGuiPluginInterface
+      IsmShared
+      LtsAppManager
+      LtsCoordTrans
+      LtsSessionData
+      LtsSession
+      LtsWidgets
+      LtsUtilsSettings
+      LtsUtilsGuiDds
+  )
+endif()
 
 NGL_INSTALL_TARGET(BuildingViewerCommon)

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

@@ -6,6 +6,14 @@
 # Created by Mike Wille, SLSE, 2017-05-15
 #
 
+# Make ${Qt6_Widgets} optional
+if(QT6_GUI_AVAILABLE AND TARGET Qt6::Widgets)
+  set(Qt6_Widgets ${Qt6_Widgets})
+else()
+  set(Qt6_Widgets "")
+endif()
+
+
 SET(SRCS
   BuildingEdit/bdv_building_edit.cpp
   BuildingEdit/bdv_building_edit.h
@@ -52,29 +60,31 @@ NGL_WRAP_UI(SRCS
 
 NGL_ADD_LIBRARY(WS BdvViewerGuiPlugin MODULE ${SRCS})
 
-NGL_TARGET_LINK_LIBRARIES(BdvViewerGuiPlugin
-  BdvViewerGuiPluginInterface
-  BldDataPluginInterface
-  BuildingViewerCommon
-  PreScriptTimelineGuiPluginInterface # Export
-  svcBldCommon
-  svcBldClient
-  svcAesClient
-  svcSrpClient
-  LtsDataView
-  LtsPluginManager
-  LtsScriptTimeline # TopicEditor
-  LtsSession
-  LtsWidgets
-  NGLLogger
-  nglwidgets
-  Qt6::Core
-  Qt6::Widgets
-  Qt6::Xml
-  TopicEditorBase
-  LtsUtilsGuiDds
-  LtsUtilsSettings
-  ngltools
-  ExportBdvTopicSetting
-)
+if(QT6_GUI_AVAILABLE)
+  NGL_TARGET_LINK_LIBRARIES(BdvViewerGuiPlugin
+    BdvViewerGuiPluginInterface
+    BldDataPluginInterface
+    BuildingViewerCommon
+    PreScriptTimelineGuiPluginInterface # Export
+    svcBldCommon
+    svcBldClient
+    svcAesClient
+    svcSrpClient
+    LtsDataView
+    LtsPluginManager
+    LtsScriptTimeline # TopicEditor
+    LtsSession
+    LtsWidgets
+    NGLLogger
+    nglwidgets
+    Qt6::Core
+    ${Qt6_Widgets}
+    Qt6::Xml
+    TopicEditorBase
+    LtsUtilsGuiDds
+    LtsUtilsSettings
+    ngltools
+    ExportBdvTopicSetting
+  )
+endif()
 NGL_INSTALL_TARGET(BdvViewerGuiPlugin)