kotatogram/cmake_helpers
1
0
Fork 0
Code Issues Activity

Use linux linking helpers without LINK_ONLY

Browse source
This commit is contained in:
Ilya Fedin 2022-01-29 02:26:48 +04:00 • committed by John Preston
parent 167a914da5
commit 985f43a162
4 changed files with 6 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
external/kwayland/CMakeLists.txt vendored
View file

@ -128,10 +128,7 @@ if (DESKTOP_APP_USE_PACKAGED)
pkg_check_modules(WAYLAND_CLIENT REQUIRED IMPORTED_TARGET wayland-client) pkg_check_modules(WAYLAND_CLIENT REQUIRED IMPORTED_TARGET wayland-client)
target_link_libraries(external_kwayland_bundled INTERFACE PkgConfig::WAYLAND_CLIENT) target_link_libraries(external_kwayland_bundled INTERFACE PkgConfig::WAYLAND_CLIENT)
else() else()
target_link_libraries(external_kwayland_bundled target_link_libraries(external_kwayland_bundled INTERFACE desktop-app::linux_wayland_helper)
INTERFACE
$<LINK_ONLY:desktop-app::linux_wayland_helper>
)
endif() endif()
add_dependencies(external_kwayland_bundled kwayland-build) add_dependencies(external_kwayland_bundled kwayland-build)

4
external/qt/CMakeLists.txt vendored
View file

@ -293,12 +293,12 @@ if (LINUX)
if (NOT DESKTOP_APP_DISABLE_WAYLAND_INTEGRATION) if (NOT DESKTOP_APP_DISABLE_WAYLAND_INTEGRATION)
target_link_libraries(external_qt target_link_libraries(external_qt
INTERFACE INTERFACE
$<LINK_ONLY:desktop-app::linux_wayland_helper> desktop-app::linux_wayland_helper
) )
endif() endif()
target_link_libraries(external_qt target_link_libraries(external_qt
INTERFACE INTERFACE
$<LINK_ONLY:desktop-app::linux_xcb_helper> desktop-app::linux_xcb_helper
fontconfig fontconfig
freetype freetype
xcb xcb

4
external/qt/qt6/CMakeLists.txt vendored
View file

@ -268,12 +268,12 @@ if (LINUX)
if (NOT DESKTOP_APP_DISABLE_WAYLAND_INTEGRATION) if (NOT DESKTOP_APP_DISABLE_WAYLAND_INTEGRATION)
target_link_libraries(external_qt target_link_libraries(external_qt
INTERFACE INTERFACE
$<LINK_ONLY:desktop-app::linux_wayland_helper> desktop-app::linux_wayland_helper
) )
endif() endif()
target_link_libraries(external_qt target_link_libraries(external_qt
INTERFACE INTERFACE
$<LINK_ONLY:desktop-app::linux_xcb_helper> desktop-app::linux_xcb_helper
fontconfig fontconfig
freetype freetype
xcb xcb

2
linux_wayland_helper/CMakeLists.txt
View file

@ -14,6 +14,6 @@ PRIVATE
) )
target_link_libraries(linux_wayland_helper target_link_libraries(linux_wayland_helper
PUBLIC PRIVATE
desktop-app::external_gsl desktop-app::external_gsl
) )