Mercurial > hg > orthanc

changeset 2514:38d666a40860

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
fix msvc
author Sebastien Jodogne <s.jodogne@gmail.com>
date Thu, 29 Mar 2018 08:55:32 +0200
parents 97a74f0eac7a
children 7c8a246e8652
files Resources/CMake/OrthancFrameworkConfiguration.cmake
diffstat 1 files changed, 10 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- 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}