# HG changeset patch # User Sebastien Jodogne # Date 1438693294 -7200 # Node ID dae7a63ff51c46293c14ec549f9a246fd6c4b298 # Parent 8546bb533b3bd2b8730300ec1efbd7423823621b sync diff -r 8546bb533b3b -r dae7a63ff51c CMakeLists.txt --- 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 diff -r 8546bb533b3b -r dae7a63ff51c Orthanc/Resources/CMake/ZlibConfiguration.cmake --- 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(