From 750861b4ab7433c3cb3706c4392eec743cba74a2 Mon Sep 17 00:00:00 2001 From: Ilya Fedin Date: Thu, 9 Sep 2021 01:14:43 +0400 Subject: [PATCH] Link drm & zlib statically like before, make GL optional --- external/ffmpeg/CMakeLists.txt | 2 +- external/qt/CMakeLists.txt | 7 ++----- external/zlib/CMakeLists.txt | 2 +- 3 files changed, 4 insertions(+), 7 deletions(-) diff --git a/external/ffmpeg/CMakeLists.txt b/external/ffmpeg/CMakeLists.txt index 720e3d7..70d46d5 100644 --- a/external/ffmpeg/CMakeLists.txt +++ b/external/ffmpeg/CMakeLists.txt @@ -72,11 +72,11 @@ else() Xv Xext Xfixes + drm ) target_link_libraries(external_ffmpeg INTERFACE X11 - drm pthread ) endif() diff --git a/external/qt/CMakeLists.txt b/external/qt/CMakeLists.txt index 711dc71..4778988 100644 --- a/external/qt/CMakeLists.txt +++ b/external/qt/CMakeLists.txt @@ -259,6 +259,7 @@ else() target_link_static_libraries(external_qt INTERFACE proxy + epoxy xkbcommon xkbcommon-x11 xcb-glx @@ -276,6 +277,7 @@ else() xcb-util xcb-render-util xcb-keysyms + z ) if (Qt5WaylandClient_FOUND) target_link_libraries(external_qt @@ -288,13 +290,8 @@ else() INTERFACE desktop-app::linux_gtk_helper $ - ) - target_link_libraries(external_qt - INTERFACE fontconfig freetype - EGL - GL xcb X11 X11-xcb diff --git a/external/zlib/CMakeLists.txt b/external/zlib/CMakeLists.txt index b1bf692..15d3b41 100644 --- a/external/zlib/CMakeLists.txt +++ b/external/zlib/CMakeLists.txt @@ -23,5 +23,5 @@ elseif (WIN32) elseif (APPLE) target_link_libraries(external_zlib INTERFACE ${libs_loc}/local/lib/libz.a) else() - target_link_libraries(external_zlib INTERFACE z) + target_link_static_libraries(external_zlib INTERFACE z) endif()