Mercurial > hg > orthanc

diff Resources/CMake/ZlibConfiguration.cmake @ 672:670dd1f2edab

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
improvements to cmake
author Sebastien Jodogne <s.jodogne@gmail.com>
date Tue, 19 Nov 2013 15:57:28 +0100
parents 6b9d09cc9e9d
children ee0d5abf7958
line wrap: on
line diff
--- a/Resources/CMake/ZlibConfiguration.cmake	Fri Nov 08 16:28:58 2013 +0100
+++ b/Resources/CMake/ZlibConfiguration.cmake	Tue Nov 19 15:57:28 2013 +0100
@@ -4,7 +4,7 @@
   ${ORTHANC_ROOT}/Resources/minizip/zip.c
   )
 
-if (${STATIC_BUILD})
+if (STATIC_BUILD OR NOT USE_SYSTEM_ZLIB)
   SET(ZLIB_SOURCES_DIR ${CMAKE_BINARY_DIR}/zlib-1.2.7)
   DownloadPackage(
     "60df6a37c56e7c1366cca812414f7b85"