Mercurial > hg > orthanc

changeset 1493:9a1c7293955b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
minizip should not be inside zlib
author Sebastien Jodogne <s.jodogne@gmail.com>
date Tue, 04 Aug 2015 14:58:56 +0200
parents 9f66a12eb8fc
children a13581480b1f
files CMakeLists.txt Resources/CMake/ZlibConfiguration.cmake
diffstat 2 files changed, 4 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- a/CMakeLists.txt	Tue Aug 04 14:47:35 2015 +0200
+++ b/CMakeLists.txt	Tue Aug 04 14:58:56 2015 +0200
@@ -382,6 +382,10 @@
 
   ${CMAKE_SOURCE_DIR}/Resources/ThirdParty/md5/md5.c
   ${CMAKE_SOURCE_DIR}/Resources/ThirdParty/base64/base64.cpp
+
+  # This is the minizip distribution to create ZIP files using zlib
+  ${ORTHANC_ROOT}/Resources/ThirdParty/minizip/ioapi.c
+  ${ORTHANC_ROOT}/Resources/ThirdParty/minizip/zip.c
   )  
 
 
--- a/Resources/CMake/ZlibConfiguration.cmake	Tue Aug 04 14:47:35 2015 +0200
+++ b/Resources/CMake/ZlibConfiguration.cmake	Tue Aug 04 14:58:56 2015 +0200
@@ -1,9 +1,3 @@
-# This is the minizip distribution to create ZIP files
-set(ZLIB_SOURCES
-  ${ORTHANC_ROOT}/Resources/ThirdParty/minizip/ioapi.c
-  ${ORTHANC_ROOT}/Resources/ThirdParty/minizip/zip.c
-  )
-
 if (STATIC_BUILD OR NOT USE_SYSTEM_ZLIB)
   SET(ZLIB_SOURCES_DIR ${CMAKE_BINARY_DIR}/zlib-1.2.7)
   DownloadPackage(