From 2793a8d3beca0156c633d66acafd84267236acf7 Mon Sep 17 00:00:00 2001 From: Ilya Fedin Date: Sat, 8 Feb 2020 08:27:06 +0400 Subject: [PATCH] Fix zlib linkage --- external/qt/CMakeLists.txt | 2 -- external/zlib/CMakeLists.txt | 2 +- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/external/qt/CMakeLists.txt b/external/qt/CMakeLists.txt index f23ede0..e1c04d7 100644 --- a/external/qt/CMakeLists.txt +++ b/external/qt/CMakeLists.txt @@ -240,8 +240,6 @@ else() SM fontconfig freetype - expat - z xcb X11 X11-xcb diff --git a/external/zlib/CMakeLists.txt b/external/zlib/CMakeLists.txt index 1e33b90..b0245a9 100644 --- a/external/zlib/CMakeLists.txt +++ b/external/zlib/CMakeLists.txt @@ -41,7 +41,7 @@ elseif (NOT WIN32) target_link_libraries(external_zlib INTERFACE external_minizip) endif() -if (NOT DESKTOP_APP_USE_PACKAGED) +if (NOT DESKTOP_APP_USE_PACKAGED AND NOT LINUX) target_include_directories(external_zlib SYSTEM INTERFACE ${libs_loc}/zlib