1
0
Fork 0

Make OBJECT libraries STATIC

This commit is contained in:
Ilya Fedin 2020-07-24 04:09:21 +04:00 committed by John Preston
parent 88c7addb4e
commit da5abddc62
12 changed files with 21 additions and 20 deletions

View file

@ -11,7 +11,7 @@ if (DESKTOP_APP_USE_PACKAGED AND NOT DESKTOP_APP_USE_PACKAGED_LAZY)
find_package(dbusmenu-qt5 REQUIRED) find_package(dbusmenu-qt5 REQUIRED)
target_link_libraries(external_dbusmenu_qt INTERFACE dbusmenu-qt5) target_link_libraries(external_dbusmenu_qt INTERFACE dbusmenu-qt5)
else() else()
add_library(external_dbusmenu_qt OBJECT) add_library(external_dbusmenu_qt STATIC)
add_library(desktop-app::external_dbusmenu_qt ALIAS external_dbusmenu_qt) add_library(desktop-app::external_dbusmenu_qt ALIAS external_dbusmenu_qt)
init_target(external_dbusmenu_qt "(external)") init_target(external_dbusmenu_qt "(external)")
@ -55,7 +55,7 @@ else()
) )
target_link_libraries(external_dbusmenu_qt target_link_libraries(external_dbusmenu_qt
PUBLIC PRIVATE
desktop-app::external_qt desktop-app::external_qt
) )
endif() endif()

View file

@ -32,6 +32,7 @@ else()
target_include_directories(external_fcitx5_qt5 target_include_directories(external_fcitx5_qt5
PRIVATE PRIVATE
${fcitx5_qt5_src} ${fcitx5_qt5_src}
${fcitx5_qt_loc}/common
) )
target_compile_definitions(external_fcitx5_qt5 target_compile_definitions(external_fcitx5_qt5

View file

@ -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(external_fcitx5_qt5_dbusaddons INTERFACE IMPORTED GLOBAL)
add_library(desktop-app::external_fcitx5_qt5_dbusaddons ALIAS external_fcitx5_qt5_dbusaddons) add_library(desktop-app::external_fcitx5_qt5_dbusaddons ALIAS external_fcitx5_qt5_dbusaddons)
else() 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) add_library(desktop-app::external_fcitx5_qt5_dbusaddons ALIAS external_fcitx5_qt5_dbusaddons)
init_target(external_fcitx5_qt5_dbusaddons "(external)") init_target(external_fcitx5_qt5_dbusaddons "(external)")
@ -37,7 +37,6 @@ else()
target_include_directories(external_fcitx5_qt5_dbusaddons target_include_directories(external_fcitx5_qt5_dbusaddons
PUBLIC PUBLIC
${fcitx5_qt_loc}/common
${fcitx5_qt5_dbusaddons_src} ${fcitx5_qt5_dbusaddons_src}
"${CMAKE_CURRENT_BINARY_DIR}" "${CMAKE_CURRENT_BINARY_DIR}"
) )

View file

@ -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(external_hime_im_client INTERFACE IMPORTED GLOBAL)
add_library(desktop-app::external_hime_im_client ALIAS external_hime_im_client) add_library(desktop-app::external_hime_im_client ALIAS external_hime_im_client)
else() 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) add_library(desktop-app::external_hime_im_client ALIAS external_hime_im_client)
init_target(external_hime_im_client "(external)") init_target(external_hime_im_client "(external)")
@ -59,7 +59,7 @@ else()
pkg_check_modules(GLIB2 REQUIRED IMPORTED_TARGET glib-2.0) pkg_check_modules(GLIB2 REQUIRED IMPORTED_TARGET glib-2.0)
target_link_libraries(external_hime_im_client target_link_libraries(external_hime_im_client
PUBLIC PRIVATE
PkgConfig::X11 PkgConfig::X11
PkgConfig::GLIB2 PkgConfig::GLIB2
) )
@ -68,13 +68,13 @@ else()
pkg_check_modules(GLIB2 REQUIRED glib-2.0) pkg_check_modules(GLIB2 REQUIRED glib-2.0)
target_include_directories(external_hime_im_client target_include_directories(external_hime_im_client
PUBLIC PRIVATE
${X11_INCLUDE_DIRS} ${X11_INCLUDE_DIRS}
${GLIB2_INCLUDE_DIRS} ${GLIB2_INCLUDE_DIRS}
) )
target_link_libraries(external_hime_im_client target_link_libraries(external_hime_im_client
PUBLIC PRIVATE
X11 X11
glib-2.0 glib-2.0
) )

View file

@ -13,7 +13,7 @@ if (DESKTOP_APP_USE_PACKAGED AND NOT DESKTOP_APP_USE_PACKAGED_LAZY)
target_link_libraries(external_hunspell INTERFACE PkgConfig::HUNSPELL) target_link_libraries(external_hunspell INTERFACE PkgConfig::HUNSPELL)
else() else()
add_library(external_hunspell OBJECT) add_library(external_hunspell STATIC)
add_library(desktop-app::external_hunspell ALIAS external_hunspell) add_library(desktop-app::external_hunspell ALIAS external_hunspell)
init_target(external_hunspell "(external)") init_target(external_hunspell "(external)")

View file

@ -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(external_xdgiconloader INTERFACE IMPORTED GLOBAL)
add_library(desktop-app::external_xdgiconloader ALIAS external_xdgiconloader) add_library(desktop-app::external_xdgiconloader ALIAS external_xdgiconloader)
else() else()
add_library(external_xdgiconloader OBJECT) add_library(external_xdgiconloader STATIC)
add_library(desktop-app::external_xdgiconloader ALIAS external_xdgiconloader) add_library(desktop-app::external_xdgiconloader ALIAS external_xdgiconloader)
init_target(external_xdgiconloader "(external)") init_target(external_xdgiconloader "(external)")
@ -53,7 +53,7 @@ else()
) )
target_link_libraries(external_xdgiconloader target_link_libraries(external_xdgiconloader
PUBLIC PRIVATE
desktop-app::external_qt desktop-app::external_qt
) )
endif() endif()

View file

@ -13,7 +13,7 @@ if (DESKTOP_APP_USE_PACKAGED AND NOT DESKTOP_APP_USE_PACKAGED_LAZY)
target_link_libraries(external_lz4 INTERFACE PkgConfig::LZ4) target_link_libraries(external_lz4 INTERFACE PkgConfig::LZ4)
else() else()
add_library(external_lz4 OBJECT) add_library(external_lz4 STATIC)
add_library(desktop-app::external_lz4 ALIAS external_lz4) add_library(desktop-app::external_lz4 ALIAS external_lz4)
init_target(external_lz4 "(external)") init_target(external_lz4 "(external)")

View file

@ -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_include_directories(external_qr_code_generator INTERFACE ${QRCODE_INCLUDE_DIRS})
target_link_libraries(external_qr_code_generator INTERFACE ${QRCODE_LIBRARIES}) target_link_libraries(external_qr_code_generator INTERFACE ${QRCODE_LIBRARIES})
else() 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) add_library(desktop-app::external_qr_code_generator ALIAS external_qr_code_generator)
init_target(external_qr_code_generator "(external)") init_target(external_qr_code_generator "(external)")

View file

@ -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(external_qt5ct INTERFACE IMPORTED GLOBAL)
add_library(desktop-app::external_qt5ct ALIAS external_qt5ct) add_library(desktop-app::external_qt5ct ALIAS external_qt5ct)
else() else()
add_library(external_qt5ct OBJECT) add_library(external_qt5ct STATIC)
add_library(desktop-app::external_qt5ct ALIAS external_qt5ct) add_library(desktop-app::external_qt5ct ALIAS external_qt5ct)
init_target(external_qt5ct "(external)") init_target(external_qt5ct "(external)")
@ -34,7 +34,7 @@ else()
) )
target_link_libraries(external_qt5ct target_link_libraries(external_qt5ct
PUBLIC PRIVATE
desktop-app::external_qt desktop-app::external_qt
) )
endif() endif()

View file

@ -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) target_link_libraries(external_rlottie INTERFACE PkgConfig::RLOTTIE)
endif() endif()
else() else()
add_library(external_rlottie OBJECT) add_library(external_rlottie STATIC)
add_library(desktop-app::external_rlottie ALIAS external_rlottie) add_library(desktop-app::external_rlottie ALIAS external_rlottie)
init_target(external_rlottie "(external)") init_target(external_rlottie "(external)")
@ -124,7 +124,7 @@ else()
if (LINUX) if (LINUX)
target_link_libraries(external_rlottie target_link_libraries(external_rlottie
PUBLIC PRIVATE
pthread pthread
) )
endif() endif()

View file

@ -5,7 +5,7 @@
# https://github.com/desktop-app/legal/blob/master/LEGAL # https://github.com/desktop-app/legal/blob/master/LEGAL
if (EXISTS ${third_party_loc}/SPMediaKeyTap) 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) add_library(desktop-app::external_sp_media_key_tap ALIAS external_sp_media_key_tap)
init_target(external_sp_media_key_tap "(external)") init_target(external_sp_media_key_tap "(external)")

View file

@ -4,7 +4,7 @@
# For license and copyright information please follow this link: # For license and copyright information please follow this link:
# https://github.com/desktop-app/legal/blob/master/LEGAL # 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) add_library(desktop-app::external_statusnotifieritem ALIAS external_statusnotifieritem)
init_target(external_statusnotifieritem "(external)") init_target(external_statusnotifieritem "(external)")
@ -31,11 +31,12 @@ target_sources(external_statusnotifieritem PRIVATE ${sni_adaptor})
target_include_directories(external_statusnotifieritem target_include_directories(external_statusnotifieritem
PUBLIC PUBLIC
${statusnotifieritem_loc} ${statusnotifieritem_loc}
PRIVATE
"${CMAKE_CURRENT_BINARY_DIR}" "${CMAKE_CURRENT_BINARY_DIR}"
) )
target_link_libraries(external_statusnotifieritem target_link_libraries(external_statusnotifieritem
PUBLIC PRIVATE
desktop-app::external_dbusmenu_qt desktop-app::external_dbusmenu_qt
desktop-app::external_qt desktop-app::external_qt
) )