# HG changeset patch # User Sebastien Jodogne # Date 1522306532 -7200 # Node ID 38d666a408603692abdda0ee717e0c21c467c556 # Parent 97a74f0eac7a8feb4131d7d7706722e3b172fb12 fix msvc diff -r 97a74f0eac7a -r 38d666a40860 Resources/CMake/OrthancFrameworkConfiguration.cmake --- a/Resources/CMake/OrthancFrameworkConfiguration.cmake Wed Mar 28 18:02:07 2018 +0200 +++ b/Resources/CMake/OrthancFrameworkConfiguration.cmake Thu Mar 29 08:55:32 2018 +0200 @@ -282,10 +282,6 @@ ${ORTHANC_ROOT}/Core/Compression/GzipCompressor.cpp ${ORTHANC_ROOT}/Core/Compression/ZipWriter.cpp ${ORTHANC_ROOT}/Core/Compression/ZlibCompressor.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 ) endif() @@ -540,6 +536,16 @@ ${ORTHANC_ROOT}/Resources/ThirdParty/base64/base64.cpp ) + +if (ENABLE_ZLIB) + list(APPEND ORTHANC_CORE_SOURCES_DEPENDENCIES + # 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 + ) +endif() + + set(ORTHANC_CORE_SOURCES ${ORTHANC_CORE_SOURCES_INTERNAL} ${ORTHANC_CORE_SOURCES_DEPENDENCIES}