From 36dc69e460d907be65d3f6b7b8f026bfb7157d05 Mon Sep 17 00:00:00 2001 From: Ilya Fedin Date: Thu, 23 Jul 2020 06:50:17 +0400 Subject: [PATCH] Move Qt plugins dependencies to subfolders --- external/CMakeLists.txt | 9 +-------- external/fcitx5_qt5/CMakeLists.txt | 1 + .../fcitx5_qt5_dbusaddons/CMakeLists.txt | 0 external/hime_qt/CMakeLists.txt | 1 + .../hime_im_client/CMakeLists.txt | 0 external/lxqt_qtplugin/CMakeLists.txt | 1 + .../xdgiconloader/CMakeLists.txt | 0 external/qt5ct_support/CMakeLists.txt | 18 ++++++++++++++++++ .../{ => qt5ct_support}/qt5ct/CMakeLists.txt | 0 .../qt5ct_qtplugin/CMakeLists.txt | 0 .../qt5ct_style/CMakeLists.txt | 0 11 files changed, 22 insertions(+), 8 deletions(-) rename external/{ => fcitx5_qt5}/fcitx5_qt5_dbusaddons/CMakeLists.txt (100%) rename external/{ => hime_qt}/hime_im_client/CMakeLists.txt (100%) rename external/{ => lxqt_qtplugin}/xdgiconloader/CMakeLists.txt (100%) create mode 100644 external/qt5ct_support/CMakeLists.txt rename external/{ => qt5ct_support}/qt5ct/CMakeLists.txt (100%) rename external/{ => qt5ct_support}/qt5ct_qtplugin/CMakeLists.txt (100%) rename external/{ => qt5ct_support}/qt5ct_style/CMakeLists.txt (100%) diff --git a/external/CMakeLists.txt b/external/CMakeLists.txt index 9109233..c5db7d7 100644 --- a/external/CMakeLists.txt +++ b/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) diff --git a/external/fcitx5_qt5/CMakeLists.txt b/external/fcitx5_qt5/CMakeLists.txt index 6b704f1..babc086 100644 --- a/external/fcitx5_qt5/CMakeLists.txt +++ b/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 diff --git a/external/fcitx5_qt5_dbusaddons/CMakeLists.txt b/external/fcitx5_qt5/fcitx5_qt5_dbusaddons/CMakeLists.txt similarity index 100% rename from external/fcitx5_qt5_dbusaddons/CMakeLists.txt rename to external/fcitx5_qt5/fcitx5_qt5_dbusaddons/CMakeLists.txt diff --git a/external/hime_qt/CMakeLists.txt b/external/hime_qt/CMakeLists.txt index 59c9b5a..f1d1fcf 100644 --- a/external/hime_qt/CMakeLists.txt +++ b/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 diff --git a/external/hime_im_client/CMakeLists.txt b/external/hime_qt/hime_im_client/CMakeLists.txt similarity index 100% rename from external/hime_im_client/CMakeLists.txt rename to external/hime_qt/hime_im_client/CMakeLists.txt diff --git a/external/lxqt_qtplugin/CMakeLists.txt b/external/lxqt_qtplugin/CMakeLists.txt index 9625c37..8796cde 100644 --- a/external/lxqt_qtplugin/CMakeLists.txt +++ b/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 diff --git a/external/xdgiconloader/CMakeLists.txt b/external/lxqt_qtplugin/xdgiconloader/CMakeLists.txt similarity index 100% rename from external/xdgiconloader/CMakeLists.txt rename to external/lxqt_qtplugin/xdgiconloader/CMakeLists.txt diff --git a/external/qt5ct_support/CMakeLists.txt b/external/qt5ct_support/CMakeLists.txt new file mode 100644 index 0000000..eea85e2 --- /dev/null +++ b/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 +) diff --git a/external/qt5ct/CMakeLists.txt b/external/qt5ct_support/qt5ct/CMakeLists.txt similarity index 100% rename from external/qt5ct/CMakeLists.txt rename to external/qt5ct_support/qt5ct/CMakeLists.txt diff --git a/external/qt5ct_qtplugin/CMakeLists.txt b/external/qt5ct_support/qt5ct_qtplugin/CMakeLists.txt similarity index 100% rename from external/qt5ct_qtplugin/CMakeLists.txt rename to external/qt5ct_support/qt5ct_qtplugin/CMakeLists.txt diff --git a/external/qt5ct_style/CMakeLists.txt b/external/qt5ct_support/qt5ct_style/CMakeLists.txt similarity index 100% rename from external/qt5ct_style/CMakeLists.txt rename to external/qt5ct_support/qt5ct_style/CMakeLists.txt