Adds latest migration results

qt6-after/qt6-migrated-legatus/Lts/Plugins/TakeHomePackageManager/OldTHP/ThpManagement/CMakeLists.txt

@@ -9,6 +9,21 @@
 #
 # Common
 #
+# Make ${Qt6_Widgets} optional
+if(QT6_GUI_AVAILABLE AND TARGET Qt6::Widgets)
+  set(Qt6_Widgets ${Qt6_Widgets})
+else()
+  set(Qt6_Widgets "")
+endif()
+
+# Make ${Qt6_WebSockets} optional
+if(QT6_GUI_AVAILABLE AND TARGET Qt6::WebSockets)
+  set(Qt6_WebSockets ${Qt6_WebSockets})
+else()
+  set(Qt6_WebSockets "")
+endif()
+
+
 SET(thp_SRCS
   tpm_gui_plugin.cpp
   tpm_gui_plugin.h
@@ -25,24 +40,26 @@ QT5_WRAP_UI(thp_SRCS
 #TODO: auto-remove "libTakeHomePackageManagerGuiPlugin.so" from lib as this lib replaces it
 
 NGL_ADD_LIBRARY2(WS ThpManagementGuiPlugin MODULE ${thp_SRCS})
-NGL_TARGET_LINK_LIBRARIES(ThpManagementGuiPlugin
-  ThpCommon
-  TpmGuiPluginInterface
-  Qt6::Widgets
-  Qt6::Network
-  Qt6::WebSockets
-  NGLLogger
-  LtsWidgets
-  LtsSession
-  LtsDataView
-  nglcompression
-  nglsettings
-  ngltools
-  AsmDataPluginInterface
-  ExmDataPluginInterface
-  LtsSessionData
-  httq
-)
+if(QT6_GUI_AVAILABLE)
+  NGL_TARGET_LINK_LIBRARIES(ThpManagementGuiPlugin
+    ThpCommon
+    TpmGuiPluginInterface
+    ${Qt6_Widgets}
+    Qt6::Network
+    ${Qt6_WebSockets}
+    NGLLogger
+    LtsWidgets
+    LtsSession
+    LtsDataView
+    nglcompression
+    nglsettings
+    ngltools
+    AsmDataPluginInterface
+    ExmDataPluginInterface
+    LtsSessionData
+    httq
+  )
+endif()
 
 NGL_INSTALL_TARGET(ThpManagementGuiPlugin)
 

qt6-after/qt6-migrated-legatus/Lts/Plugins/TakeHomePackageManager/OldTHP/ThpUsbManagement/CMakeLists.txt

@@ -6,6 +6,21 @@
 # Created by Mike Wille, SLTE, 2020-03-23
 #
 
+# Make ${Qt6_Widgets} optional
+if(QT6_GUI_AVAILABLE AND TARGET Qt6::Widgets)
+  set(Qt6_Widgets ${Qt6_Widgets})
+else()
+  set(Qt6_Widgets "")
+endif()
+
+# Make ${Qt6_WebSockets} optional
+if(QT6_GUI_AVAILABLE AND TARGET Qt6::WebSockets)
+  set(Qt6_WebSockets ${Qt6_WebSockets})
+else()
+  set(Qt6_WebSockets "")
+endif()
+
+
 SET(src
   tpm_usb_gui_plugin.cpp
   tpm_usb_gui_plugin.h
@@ -20,25 +35,27 @@ QT5_WRAP_UI(src
 )
 
 NGL_ADD_LIBRARY2(WS ThpUsbManagementGuiPlugin MODULE ${src})
-NGL_TARGET_LINK_LIBRARIES(ThpUsbManagementGuiPlugin
-  ThpCommon
-  TpmGuiPluginInterface
-  Qt6::Widgets
-  Qt6::Network
-  Qt6::WebSockets
-  NGLLogger
-  LtsWidgets
-  LtsSession
-  LtsDataView
-  nglcompression
-  nglsettings
-  ngltools
-  LtsSessionData
-
-  # for creating data.json
-  AsmDataPluginInterface
-  ExmDataPluginInterface
-)
+if(QT6_GUI_AVAILABLE)
+  NGL_TARGET_LINK_LIBRARIES(ThpUsbManagementGuiPlugin
+    ThpCommon
+    TpmGuiPluginInterface
+    ${Qt6_Widgets}
+    Qt6::Network
+    ${Qt6_WebSockets}
+    NGLLogger
+    LtsWidgets
+    LtsSession
+    LtsDataView
+    nglcompression
+    nglsettings
+    ngltools
+    LtsSessionData
+  
+    # for creating data.json
+    AsmDataPluginInterface
+    ExmDataPluginInterface
+  )
+endif()
 
 NGL_INSTALL_TARGET(ThpUsbManagementGuiPlugin)