Move Qt plugins dependencies to subfolders

external/CMakeLists.txt

@@ -20,12 +20,10 @@ add_checked_subdirectory(expected)
 if (LINUX AND NOT DESKTOP_APP_DISABLE_DBUS_INTEGRATION)
     add_checked_subdirectory(fcitx_qt5)
     add_checked_subdirectory(fcitx5_qt5)
-    add_checked_subdirectory(fcitx5_qt5_dbusaddons)
 endif()
 add_checked_subdirectory(ffmpeg)
 add_checked_subdirectory(gsl)
 if (LINUX AND NOT DESKTOP_APP_DISABLE_DBUS_INTEGRATION)
-    add_checked_subdirectory(hime_im_client)
     add_checked_subdirectory(hime_qt)
 endif()
 if (add_hunspell_library)
@@ -48,9 +46,7 @@ add_checked_subdirectory(openssl)
 add_checked_subdirectory(opus)
 add_checked_subdirectory(qt)
 if (LINUX)
-    add_checked_subdirectory(qt5ct)
-    add_checked_subdirectory(qt5ct_qtplugin)
-    add_checked_subdirectory(qt5ct_style)
+    add_checked_subdirectory(qt5ct_support)
 endif()
 add_checked_subdirectory(qr_code_generator)
 add_checked_subdirectory(ranges)
@@ -63,8 +59,5 @@ if (LINUX AND NOT DESKTOP_APP_DISABLE_DBUS_INTEGRATION)
 endif()
 add_checked_subdirectory(ton)
 add_checked_subdirectory(variant)
-if (LINUX)
-    add_checked_subdirectory(xdgiconloader)
-endif()
 add_checked_subdirectory(xxhash)
 add_checked_subdirectory(zlib)

external/fcitx5_qt5/CMakeLists.txt

@@ -40,6 +40,7 @@ else()
         FCITX_PLUGIN_DATA_FILE_PATH="${CMAKE_CURRENT_BINARY_DIR}/fcitx5.json"
     )
 
+    add_subdirectory(fcitx5_qt5_dbusaddons)
     target_link_libraries(external_fcitx5_qt5
     PRIVATE
         desktop-app::external_fcitx5_qt5_dbusaddons

external/hime_qt/CMakeLists.txt

@@ -35,6 +35,7 @@ else()
         QT_STATICPLUGIN
     )
 
+    add_subdirectory(hime_im_client)
     target_link_libraries(external_hime_qt
     PRIVATE
         desktop-app::external_hime_im_client

external/lxqt_qtplugin/CMakeLists.txt

@@ -38,6 +38,7 @@ else()
         LIB_FM_QT_SONAME="libfm-qt.so.7"
     )
 
+    add_subdirectory(xdgiconloader)
     target_link_libraries(external_lxqt_qtplugin
     PRIVATE
         desktop-app::external_statusnotifieritem

external/qt5ct_support/CMakeLists.txt

@@ -0,0 +1,18 @@
+# This file is part of Desktop App Toolkit,
+# a set of libraries for developing nice desktop applications.
+#
+# For license and copyright information please follow this link:
+# https://github.com/desktop-app/legal/blob/master/LEGAL
+
+add_library(external_qt5ct_support INTERFACE IMPORTED GLOBAL)
+add_library(desktop-app::external_qt5ct_support ALIAS external_qt5ct_support)
+
+add_subdirectory(qt5ct)
+add_subdirectory(qt5ct_qtplugin)
+add_subdirectory(qt5ct_style)
+
+target_link_libraries(external_qt5ct_support
+INTERFACE
+    desktop-app::external_qt5ct_style
+    desktop-app::external_qt5ct_qtplugin
+)