Don't link wayland-client statically.
This commit is contained in:
parent
52ccf5e17a
commit
d1a7e08aa0
2 changed files with 11 additions and 9 deletions
11
external/kwayland/CMakeLists.txt
vendored
11
external/kwayland/CMakeLists.txt
vendored
|
|
@ -25,14 +25,15 @@ else()
|
||||||
/usr/local/include/KF5/KWayland/Client
|
/usr/local/include/KF5/KWayland/Client
|
||||||
)
|
)
|
||||||
|
|
||||||
target_link_static_libraries(external_kwayland
|
# target_link_static_libraries(external_kwayland
|
||||||
INTERFACE
|
# INTERFACE
|
||||||
wayland-client
|
# wayland-client # We load system libwayland-*.so dynamically now.
|
||||||
ffi
|
# ffi
|
||||||
)
|
# )
|
||||||
|
|
||||||
target_link_libraries(external_kwayland
|
target_link_libraries(external_kwayland
|
||||||
INTERFACE
|
INTERFACE
|
||||||
|
$<TARGET_FILE:desktop-app::lib_base> # For wayland-* stubs.
|
||||||
${qt_loc}/lib/libQt5Concurrent.a
|
${qt_loc}/lib/libQt5Concurrent.a
|
||||||
desktop-app::external_qt
|
desktop-app::external_qt
|
||||||
)
|
)
|
||||||
|
|
|
||||||
9
external/qt/CMakeLists.txt
vendored
9
external/qt/CMakeLists.txt
vendored
|
|
@ -347,9 +347,9 @@ else()
|
||||||
endif()
|
endif()
|
||||||
target_link_static_libraries(external_qt
|
target_link_static_libraries(external_qt
|
||||||
INTERFACE
|
INTERFACE
|
||||||
wayland-egl
|
# wayland-egl # We load system libwayland-*.so dynamically now.
|
||||||
wayland-cursor
|
# wayland-cursor
|
||||||
wayland-client
|
# wayland-client
|
||||||
xkbcommon
|
xkbcommon
|
||||||
xkbcommon-x11
|
xkbcommon-x11
|
||||||
xcb-glx
|
xcb-glx
|
||||||
|
|
@ -367,7 +367,7 @@ else()
|
||||||
xcb-util
|
xcb-util
|
||||||
xcb-render-util
|
xcb-render-util
|
||||||
xcb-keysyms
|
xcb-keysyms
|
||||||
ffi
|
# ffi
|
||||||
)
|
)
|
||||||
if (DESKTOP_APP_USE_GLIBC_WRAPS)
|
if (DESKTOP_APP_USE_GLIBC_WRAPS)
|
||||||
target_link_libraries(external_qt
|
target_link_libraries(external_qt
|
||||||
|
|
@ -378,6 +378,7 @@ else()
|
||||||
endif()
|
endif()
|
||||||
target_link_libraries(external_qt
|
target_link_libraries(external_qt
|
||||||
INTERFACE
|
INTERFACE
|
||||||
|
$<TARGET_FILE:desktop-app::lib_base> # For wayland-* stubs.
|
||||||
fontconfig
|
fontconfig
|
||||||
freetype
|
freetype
|
||||||
EGL
|
EGL
|
||||||
|
|
|
||||||
Loading…
Add table
Reference in a new issue