From 97eeefd7713bd649541405388e010709546ec206 Mon Sep 17 00:00:00 2001 From: "Peter Åstrand (astrand)" Date: Wed, 19 Sep 2018 15:18:25 +0200 Subject: Link zlib statically on all platforms The API and ABI isn't as stable as we need, so it isn't safe to link it dynamically even on Linux. --- cmake/StaticBuild.cmake | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) (limited to 'cmake') diff --git a/cmake/StaticBuild.cmake b/cmake/StaticBuild.cmake index 4b58b1de..a9943098 100644 --- a/cmake/StaticBuild.cmake +++ b/cmake/StaticBuild.cmake @@ -19,10 +19,7 @@ if(BUILD_STATIC) set(BUILD_STATIC_GCC 1) set(JPEG_LIBRARIES "-Wl,-Bstatic -ljpeg -Wl,-Bdynamic") - - if(WIN32) - set(ZLIB_LIBRARIES "-Wl,-Bstatic -lz -Wl,-Bdynamic") - endif() + set(ZLIB_LIBRARIES "-Wl,-Bstatic -lz -Wl,-Bdynamic") # gettext is included in libc on many unix systems if(NOT LIBC_HAS_DGETTEXT) -- cgit v1.2.3