Mercurial > hg > orthanc-dicomweb

changeset 60:dae7a63ff51c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
sync
author Sebastien Jodogne <s.jodogne@gmail.com>
date Tue, 04 Aug 2015 15:01:34 +0200
parents 8546bb533b3b
children 130511d63f68 88e551855cb2
files CMakeLists.txt Orthanc/Resources/CMake/ZlibConfiguration.cmake
diffstat 2 files changed, 1 insertions(+), 7 deletions(-) [+]
line wrap: on
line diff
--- a/CMakeLists.txt	Tue Aug 04 14:50:53 2015 +0200
+++ b/CMakeLists.txt	Tue Aug 04 15:01:34 2015 +0200
@@ -115,7 +115,7 @@
   ${JSONCPP_SOURCES}
   ${LIBJPEG_SOURCES}
   ${LIBPNG_SOURCES}
-  ${ZLIB}
+  ${ZLIB_SOURCES}
   ${PUGIXML_SOURCES}
 
   ${ORTHANC_ROOT}/Core/ChunkedBuffer.cpp
--- a/Orthanc/Resources/CMake/ZlibConfiguration.cmake	Tue Aug 04 14:50:53 2015 +0200
+++ b/Orthanc/Resources/CMake/ZlibConfiguration.cmake	Tue Aug 04 15:01:34 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(