summaryrefslogtreecommitdiffstats
path: root/cmake
diff options
context:
space:
mode:
authorPierre Ossman <ossman@cendio.se>2015-02-03 09:54:49 +0100
committerPierre Ossman <ossman@cendio.se>2015-02-03 09:54:49 +0100
commitcc8c6a296f48552dde4375c5b491225262b4814f (patch)
tree3aa592a2b67137cd60664cda546404f15daa12a1 /cmake
parent27eb55e1975c4f558f6a53d573091e76064cc8e7 (diff)
downloadtigervnc-cc8c6a296f48552dde4375c5b491225262b4814f.tar.gz
tigervnc-cc8c6a296f48552dde4375c5b491225262b4814f.zip
Drop bundled zlib
We're not doing a sufficient job of keeping this updated so list it as an external requirement instead.
Diffstat (limited to 'cmake')
-rw-r--r--cmake/StaticBuild.cmake2
1 files changed, 1 insertions, 1 deletions
diff --git a/cmake/StaticBuild.cmake b/cmake/StaticBuild.cmake
index 49706bd3..bac22025 100644
--- a/cmake/StaticBuild.cmake
+++ b/cmake/StaticBuild.cmake
@@ -15,7 +15,7 @@ if(BUILD_STATIC)
set(JPEG_LIBRARIES "-Wl,-Bstatic -ljpeg -Wl,-Bdynamic")
- if(WIN32 AND NOT USE_INCLUDED_ZLIB)
+ if(WIN32)
set(ZLIB_LIBRARIES "-Wl,-Bstatic -lz -Wl,-Bdynamic")
endif()