Use linux linking helpers without LINK_ONLY
This commit is contained in:
parent
167a914da5
commit
985f43a162
4 changed files with 6 additions and 9 deletions
5
external/kwayland/CMakeLists.txt
vendored
5
external/kwayland/CMakeLists.txt
vendored
|
|
@ -128,10 +128,7 @@ if (DESKTOP_APP_USE_PACKAGED)
|
|||
pkg_check_modules(WAYLAND_CLIENT REQUIRED IMPORTED_TARGET wayland-client)
|
||||
target_link_libraries(external_kwayland_bundled INTERFACE PkgConfig::WAYLAND_CLIENT)
|
||||
else()
|
||||
target_link_libraries(external_kwayland_bundled
|
||||
INTERFACE
|
||||
$<LINK_ONLY:desktop-app::linux_wayland_helper>
|
||||
)
|
||||
target_link_libraries(external_kwayland_bundled INTERFACE desktop-app::linux_wayland_helper)
|
||||
endif()
|
||||
|
||||
add_dependencies(external_kwayland_bundled kwayland-build)
|
||||
|
|
|
|||
4
external/qt/CMakeLists.txt
vendored
4
external/qt/CMakeLists.txt
vendored
|
|
@ -293,12 +293,12 @@ if (LINUX)
|
|||
if (NOT DESKTOP_APP_DISABLE_WAYLAND_INTEGRATION)
|
||||
target_link_libraries(external_qt
|
||||
INTERFACE
|
||||
$<LINK_ONLY:desktop-app::linux_wayland_helper>
|
||||
desktop-app::linux_wayland_helper
|
||||
)
|
||||
endif()
|
||||
target_link_libraries(external_qt
|
||||
INTERFACE
|
||||
$<LINK_ONLY:desktop-app::linux_xcb_helper>
|
||||
desktop-app::linux_xcb_helper
|
||||
fontconfig
|
||||
freetype
|
||||
xcb
|
||||
|
|
|
|||
4
external/qt/qt6/CMakeLists.txt
vendored
4
external/qt/qt6/CMakeLists.txt
vendored
|
|
@ -268,12 +268,12 @@ if (LINUX)
|
|||
if (NOT DESKTOP_APP_DISABLE_WAYLAND_INTEGRATION)
|
||||
target_link_libraries(external_qt
|
||||
INTERFACE
|
||||
$<LINK_ONLY:desktop-app::linux_wayland_helper>
|
||||
desktop-app::linux_wayland_helper
|
||||
)
|
||||
endif()
|
||||
target_link_libraries(external_qt
|
||||
INTERFACE
|
||||
$<LINK_ONLY:desktop-app::linux_xcb_helper>
|
||||
desktop-app::linux_xcb_helper
|
||||
fontconfig
|
||||
freetype
|
||||
xcb
|
||||
|
|
|
|||
|
|
@ -14,6 +14,6 @@ PRIVATE
|
|||
)
|
||||
|
||||
target_link_libraries(linux_wayland_helper
|
||||
PUBLIC
|
||||
PRIVATE
|
||||
desktop-app::external_gsl
|
||||
)
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue