Don't link wayland-client statically.

desktop-app · Apr 29, 2021 · d1a7e08 · d1a7e08
1 parent 52ccf5e
commit d1a7e08
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 9 deletions.
diff --git a/external/kwayland/CMakeLists.txt b/external/kwayland/CMakeLists.txt
@@ -25,14 +25,15 @@ else()
         /usr/local/include/KF5/KWayland/Client
     )
 
-    target_link_static_libraries(external_kwayland
-    INTERFACE
-        wayland-client
-        ffi
-    )
+    # target_link_static_libraries(external_kwayland
+    # INTERFACE
+        # wayland-client # We load system libwayland-*.so dynamically now.
+        # ffi
+    # )
 
     target_link_libraries(external_kwayland
     INTERFACE
+        $<TARGET_FILE:desktop-app::lib_base> # For wayland-* stubs.
         ${qt_loc}/lib/libQt5Concurrent.a
         desktop-app::external_qt
     )

diff --git a/external/qt/CMakeLists.txt b/external/qt/CMakeLists.txt
@@ -347,9 +347,9 @@ else()
         endif()
         target_link_static_libraries(external_qt
         INTERFACE
-            wayland-egl
-            wayland-cursor
-            wayland-client
+            # wayland-egl # We load system libwayland-*.so dynamically now.
+            # wayland-cursor
+            # wayland-client
             xkbcommon
             xkbcommon-x11
             xcb-glx
@@ -367,7 +367,7 @@ else()
             xcb-util
             xcb-render-util
             xcb-keysyms
-            ffi
+            # ffi
         )
         if (DESKTOP_APP_USE_GLIBC_WRAPS)
             target_link_libraries(external_qt
@@ -378,6 +378,7 @@ else()
         endif()
         target_link_libraries(external_qt
         INTERFACE
+            $<TARGET_FILE:desktop-app::lib_base> # For wayland-* stubs.
             fontconfig
             freetype
             EGL