From da5abddc62996e4c36b8a95198bd3aebe9f53a11 Mon Sep 17 00:00:00 2001 From: Ilya Fedin Date: Fri, 24 Jul 2020 04:09:21 +0400 Subject: [PATCH] Make OBJECT libraries STATIC --- external/dbusmenu_qt/CMakeLists.txt | 4 ++-- external/fcitx5_qt5/CMakeLists.txt | 1 + external/fcitx5_qt5/fcitx5_qt5_dbusaddons/CMakeLists.txt | 3 +-- external/hime_qt/hime_im_client/CMakeLists.txt | 8 ++++---- external/hunspell/CMakeLists.txt | 2 +- external/lxqt_qtplugin/xdgiconloader/CMakeLists.txt | 4 ++-- external/lz4/CMakeLists.txt | 2 +- external/qr_code_generator/CMakeLists.txt | 2 +- external/qt5ct_support/qt5ct/CMakeLists.txt | 4 ++-- external/rlottie/CMakeLists.txt | 4 ++-- external/sp_media_key_tap/CMakeLists.txt | 2 +- external/statusnotifieritem/CMakeLists.txt | 5 +++-- 12 files changed, 21 insertions(+), 20 deletions(-) diff --git a/external/dbusmenu_qt/CMakeLists.txt b/external/dbusmenu_qt/CMakeLists.txt index 9bcf37a..6c72fb8 100644 --- a/external/dbusmenu_qt/CMakeLists.txt +++ b/external/dbusmenu_qt/CMakeLists.txt @@ -11,7 +11,7 @@ if (DESKTOP_APP_USE_PACKAGED AND NOT DESKTOP_APP_USE_PACKAGED_LAZY) find_package(dbusmenu-qt5 REQUIRED) target_link_libraries(external_dbusmenu_qt INTERFACE dbusmenu-qt5) else() - add_library(external_dbusmenu_qt OBJECT) + add_library(external_dbusmenu_qt STATIC) add_library(desktop-app::external_dbusmenu_qt ALIAS external_dbusmenu_qt) init_target(external_dbusmenu_qt "(external)") @@ -55,7 +55,7 @@ else() ) target_link_libraries(external_dbusmenu_qt - PUBLIC + PRIVATE desktop-app::external_qt ) endif() diff --git a/external/fcitx5_qt5/CMakeLists.txt b/external/fcitx5_qt5/CMakeLists.txt index babc086..3a7d26a 100644 --- a/external/fcitx5_qt5/CMakeLists.txt +++ b/external/fcitx5_qt5/CMakeLists.txt @@ -32,6 +32,7 @@ else() target_include_directories(external_fcitx5_qt5 PRIVATE ${fcitx5_qt5_src} + ${fcitx5_qt_loc}/common ) target_compile_definitions(external_fcitx5_qt5 diff --git a/external/fcitx5_qt5/fcitx5_qt5_dbusaddons/CMakeLists.txt b/external/fcitx5_qt5/fcitx5_qt5_dbusaddons/CMakeLists.txt index a5a213b..9af7e3e 100644 --- a/external/fcitx5_qt5/fcitx5_qt5_dbusaddons/CMakeLists.txt +++ b/external/fcitx5_qt5/fcitx5_qt5_dbusaddons/CMakeLists.txt @@ -8,7 +8,7 @@ if (DESKTOP_APP_USE_PACKAGED AND NOT DESKTOP_APP_USE_PACKAGED_LAZY) add_library(external_fcitx5_qt5_dbusaddons INTERFACE IMPORTED GLOBAL) add_library(desktop-app::external_fcitx5_qt5_dbusaddons ALIAS external_fcitx5_qt5_dbusaddons) else() - add_library(external_fcitx5_qt5_dbusaddons OBJECT) + add_library(external_fcitx5_qt5_dbusaddons STATIC) add_library(desktop-app::external_fcitx5_qt5_dbusaddons ALIAS external_fcitx5_qt5_dbusaddons) init_target(external_fcitx5_qt5_dbusaddons "(external)") @@ -37,7 +37,6 @@ else() target_include_directories(external_fcitx5_qt5_dbusaddons PUBLIC - ${fcitx5_qt_loc}/common ${fcitx5_qt5_dbusaddons_src} "${CMAKE_CURRENT_BINARY_DIR}" ) diff --git a/external/hime_qt/hime_im_client/CMakeLists.txt b/external/hime_qt/hime_im_client/CMakeLists.txt index 17d0e42..72d7bea 100644 --- a/external/hime_qt/hime_im_client/CMakeLists.txt +++ b/external/hime_qt/hime_im_client/CMakeLists.txt @@ -8,7 +8,7 @@ if (DESKTOP_APP_USE_PACKAGED AND NOT DESKTOP_APP_USE_PACKAGED_LAZY) add_library(external_hime_im_client INTERFACE IMPORTED GLOBAL) add_library(desktop-app::external_hime_im_client ALIAS external_hime_im_client) else() - add_library(external_hime_im_client OBJECT) + add_library(external_hime_im_client STATIC) add_library(desktop-app::external_hime_im_client ALIAS external_hime_im_client) init_target(external_hime_im_client "(external)") @@ -59,7 +59,7 @@ else() pkg_check_modules(GLIB2 REQUIRED IMPORTED_TARGET glib-2.0) target_link_libraries(external_hime_im_client - PUBLIC + PRIVATE PkgConfig::X11 PkgConfig::GLIB2 ) @@ -68,13 +68,13 @@ else() pkg_check_modules(GLIB2 REQUIRED glib-2.0) target_include_directories(external_hime_im_client - PUBLIC + PRIVATE ${X11_INCLUDE_DIRS} ${GLIB2_INCLUDE_DIRS} ) target_link_libraries(external_hime_im_client - PUBLIC + PRIVATE X11 glib-2.0 ) diff --git a/external/hunspell/CMakeLists.txt b/external/hunspell/CMakeLists.txt index 70dc2ba..2bd3d5e 100644 --- a/external/hunspell/CMakeLists.txt +++ b/external/hunspell/CMakeLists.txt @@ -13,7 +13,7 @@ if (DESKTOP_APP_USE_PACKAGED AND NOT DESKTOP_APP_USE_PACKAGED_LAZY) target_link_libraries(external_hunspell INTERFACE PkgConfig::HUNSPELL) else() - add_library(external_hunspell OBJECT) + add_library(external_hunspell STATIC) add_library(desktop-app::external_hunspell ALIAS external_hunspell) init_target(external_hunspell "(external)") diff --git a/external/lxqt_qtplugin/xdgiconloader/CMakeLists.txt b/external/lxqt_qtplugin/xdgiconloader/CMakeLists.txt index a251e05..992b3c6 100644 --- a/external/lxqt_qtplugin/xdgiconloader/CMakeLists.txt +++ b/external/lxqt_qtplugin/xdgiconloader/CMakeLists.txt @@ -8,7 +8,7 @@ if (DESKTOP_APP_USE_PACKAGED AND NOT DESKTOP_APP_USE_PACKAGED_LAZY_PLATFORMTHEME add_library(external_xdgiconloader INTERFACE IMPORTED GLOBAL) add_library(desktop-app::external_xdgiconloader ALIAS external_xdgiconloader) else() - add_library(external_xdgiconloader OBJECT) + add_library(external_xdgiconloader STATIC) add_library(desktop-app::external_xdgiconloader ALIAS external_xdgiconloader) init_target(external_xdgiconloader "(external)") @@ -53,7 +53,7 @@ else() ) target_link_libraries(external_xdgiconloader - PUBLIC + PRIVATE desktop-app::external_qt ) endif() diff --git a/external/lz4/CMakeLists.txt b/external/lz4/CMakeLists.txt index 1f203c7..053acf9 100644 --- a/external/lz4/CMakeLists.txt +++ b/external/lz4/CMakeLists.txt @@ -13,7 +13,7 @@ if (DESKTOP_APP_USE_PACKAGED AND NOT DESKTOP_APP_USE_PACKAGED_LAZY) target_link_libraries(external_lz4 INTERFACE PkgConfig::LZ4) else() - add_library(external_lz4 OBJECT) + add_library(external_lz4 STATIC) add_library(desktop-app::external_lz4 ALIAS external_lz4) init_target(external_lz4 "(external)") diff --git a/external/qr_code_generator/CMakeLists.txt b/external/qr_code_generator/CMakeLists.txt index 44a9189..4a2b2cf 100644 --- a/external/qr_code_generator/CMakeLists.txt +++ b/external/qr_code_generator/CMakeLists.txt @@ -14,7 +14,7 @@ if (DESKTOP_APP_USE_PACKAGED_QRCODE AND NOT DESKTOP_APP_USE_PACKAGED_LAZY) target_include_directories(external_qr_code_generator INTERFACE ${QRCODE_INCLUDE_DIRS}) target_link_libraries(external_qr_code_generator INTERFACE ${QRCODE_LIBRARIES}) else() - add_library(external_qr_code_generator OBJECT) + add_library(external_qr_code_generator STATIC) add_library(desktop-app::external_qr_code_generator ALIAS external_qr_code_generator) init_target(external_qr_code_generator "(external)") diff --git a/external/qt5ct_support/qt5ct/CMakeLists.txt b/external/qt5ct_support/qt5ct/CMakeLists.txt index 2d7fd25..44df85e 100644 --- a/external/qt5ct_support/qt5ct/CMakeLists.txt +++ b/external/qt5ct_support/qt5ct/CMakeLists.txt @@ -8,7 +8,7 @@ if (DESKTOP_APP_USE_PACKAGED AND NOT DESKTOP_APP_USE_PACKAGED_LAZY_PLATFORMTHEME add_library(external_qt5ct INTERFACE IMPORTED GLOBAL) add_library(desktop-app::external_qt5ct ALIAS external_qt5ct) else() - add_library(external_qt5ct OBJECT) + add_library(external_qt5ct STATIC) add_library(desktop-app::external_qt5ct ALIAS external_qt5ct) init_target(external_qt5ct "(external)") @@ -34,7 +34,7 @@ else() ) target_link_libraries(external_qt5ct - PUBLIC + PRIVATE desktop-app::external_qt ) endif() diff --git a/external/rlottie/CMakeLists.txt b/external/rlottie/CMakeLists.txt index d2e0479..ceccb60 100644 --- a/external/rlottie/CMakeLists.txt +++ b/external/rlottie/CMakeLists.txt @@ -17,7 +17,7 @@ if (DESKTOP_APP_USE_PACKAGED_RLOTTIE AND NOT DESKTOP_APP_USE_PACKAGED_LAZY) target_link_libraries(external_rlottie INTERFACE PkgConfig::RLOTTIE) endif() else() - add_library(external_rlottie OBJECT) + add_library(external_rlottie STATIC) add_library(desktop-app::external_rlottie ALIAS external_rlottie) init_target(external_rlottie "(external)") @@ -124,7 +124,7 @@ else() if (LINUX) target_link_libraries(external_rlottie - PUBLIC + PRIVATE pthread ) endif() diff --git a/external/sp_media_key_tap/CMakeLists.txt b/external/sp_media_key_tap/CMakeLists.txt index dff4e2a..ccbc02a 100644 --- a/external/sp_media_key_tap/CMakeLists.txt +++ b/external/sp_media_key_tap/CMakeLists.txt @@ -5,7 +5,7 @@ # https://github.com/desktop-app/legal/blob/master/LEGAL if (EXISTS ${third_party_loc}/SPMediaKeyTap) - add_library(external_sp_media_key_tap OBJECT) + add_library(external_sp_media_key_tap STATIC) add_library(desktop-app::external_sp_media_key_tap ALIAS external_sp_media_key_tap) init_target(external_sp_media_key_tap "(external)") diff --git a/external/statusnotifieritem/CMakeLists.txt b/external/statusnotifieritem/CMakeLists.txt index 046cff4..d17d5ad 100644 --- a/external/statusnotifieritem/CMakeLists.txt +++ b/external/statusnotifieritem/CMakeLists.txt @@ -4,7 +4,7 @@ # For license and copyright information please follow this link: # https://github.com/desktop-app/legal/blob/master/LEGAL -add_library(external_statusnotifieritem OBJECT) +add_library(external_statusnotifieritem STATIC) add_library(desktop-app::external_statusnotifieritem ALIAS external_statusnotifieritem) init_target(external_statusnotifieritem "(external)") @@ -31,11 +31,12 @@ target_sources(external_statusnotifieritem PRIVATE ${sni_adaptor}) target_include_directories(external_statusnotifieritem PUBLIC ${statusnotifieritem_loc} +PRIVATE "${CMAKE_CURRENT_BINARY_DIR}" ) target_link_libraries(external_statusnotifieritem -PUBLIC +PRIVATE desktop-app::external_dbusmenu_qt desktop-app::external_qt )