Adds latest migration results

qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/BuildingControlUnit/CMakeLists.txt

@@ -4,6 +4,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(BSM)
 ADD_SUBDIRECTORY(Json)
 ADD_SUBDIRECTORY(VWM)
@@ -48,7 +56,7 @@ NGL_TARGET_INCLUDE_DIRECTORIES(BuildingControlCommon
 NGL_ADD_EXECUTABLE(AAR SV BuildingControlUnit ${bc_SRCS})
 NGL_TARGET_LINK_LIBRARIES(BuildingControlUnit
   Qt6::Core
-  Qt6::WebSockets
+  ${Qt6_WebSockets}
 #  Qt6::Test
   Qt6::Xml
   Qt6::Network

qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/BuildingControlUnit/Json/CMakeLists.txt

@@ -4,6 +4,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(json_SRCS
   json_api.cpp
   json_api.h
@@ -14,7 +22,7 @@ SET(json_SRCS
 NGL_ADD_LIBRARY2(AAR SV BuildingControlJson SHARED ${json_SRCS})
 NGL_TARGET_LINK_LIBRARIES(BuildingControlJson
   PRIVATE
-    Qt6::WebSockets
+    ${Qt6_WebSockets}
   PUBLIC
     Qt6::Core
     Qt6::Network

qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/BuildingControlUnit/VWM/CMakeLists.txt

@@ -4,6 +4,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(vwm_SRCS
   vwm_api.cpp
   vwm_api.h
@@ -23,16 +31,18 @@ SET(vwm_SRCS
 )
 
 NGL_ADD_LIBRARY2(AAR SV BuildingControlVwm SHARED ${vwm_SRCS})
-NGL_TARGET_LINK_LIBRARIES(BuildingControlVwm
-  PRIVATE
-    ngltools
-    Qt6::Xml
-  PUBLIC
-    Qt6::Core
-    Qt6::Gui
-    LtsUtilsCoreHeaderOnly
-    BuildingControlCommon
-)
+if(QT6_GUI_AVAILABLE)
+  NGL_TARGET_LINK_LIBRARIES(BuildingControlVwm
+    PRIVATE
+      ngltools
+      Qt6::Xml
+    PUBLIC
+      Qt6::Core
+      ${Qt6_Gui}
+      LtsUtilsCoreHeaderOnly
+      BuildingControlCommon
+  )
+endif()
 ################################
 ### Test
 ################################
@@ -49,15 +59,17 @@ NGL_TARGET_LINK_LIBRARIES(BuildingControlTestVwm
   LtsCoordTrans
 )
 NGL_ADD_EXECUTABLE(AAR SV BuildingControlTestVwmXml test_vwm_xml.cpp)
-NGL_TARGET_LINK_LIBRARIES(BuildingControlTestVwmXml
-  LtsUtilsCoreHeaderOnly
-  Qt6::Xml
-  Qt6::Core
-  Qt6::Gui
-  BuildingControlVwm
-  BuildingControlCommon
-  nglcoreapplication
-)
+if(QT6_GUI_AVAILABLE)
+  NGL_TARGET_LINK_LIBRARIES(BuildingControlTestVwmXml
+    LtsUtilsCoreHeaderOnly
+    Qt6::Xml
+    Qt6::Core
+    ${Qt6_Gui}
+    BuildingControlVwm
+    BuildingControlCommon
+    nglcoreapplication
+  )
+endif()
 
 IF(BUILD_TESTING AND TARGET BuildingControlVwm)
   SET(test_SRCS
@@ -66,7 +78,7 @@ IF(BUILD_TESTING AND TARGET BuildingControlVwm)
   )
   ADD_EXECUTABLE(bld_vwm_math_unit_test ${test_SRCS})
   TARGET_LINK_LIBRARIES(bld_vwm_math_unit_test
-    Qt6::Gui
+    ${Qt6_Gui}
     Qt6::Core
     Qt6::Test
     BuildingControlVwm