| commit | cc8c6a296f48552dde4375c5b491225262b4814f | [log] [tgz] |
|---|---|---|
| author | Pierre Ossman <ossman@cendio.se> | Tue Feb 03 09:54:49 2015 +0100 |
| committer | Pierre Ossman <ossman@cendio.se> | Tue Feb 03 09:54:49 2015 +0100 |
| tree | 3aa592a2b67137cd60664cda546404f15daa12a1 | |
| parent | 27eb55e1975c4f558f6a53d573091e76064cc8e7 [diff] [blame] |
Drop bundled zlib We're not doing a sufficient job of keeping this updated so list it as an external requirement instead.
diff --git a/cmake/StaticBuild.cmake b/cmake/StaticBuild.cmake index 49706bd..bac2202 100644 --- a/cmake/StaticBuild.cmake +++ b/cmake/StaticBuild.cmake
@@ -15,7 +15,7 @@ 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()