Mercurial > hg > orthanc

changeset 2785:a16ad34d46f1

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
fix msvc build
author Sebastien Jodogne <s.jodogne@gmail.com>
date Tue, 24 Jul 2018 20:11:02 +0200
parents 167105b5b48e
children e7a10626645f
files Resources/CMake/OrthancFrameworkConfiguration.cmake
diffstat 1 files changed, 9 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/Resources/CMake/OrthancFrameworkConfiguration.cmake	Tue Jul 24 17:57:02 2018 +0200
+++ b/Resources/CMake/OrthancFrameworkConfiguration.cmake	Tue Jul 24 20:11:02 2018 +0200
@@ -302,10 +302,6 @@
       ${ORTHANC_ROOT}/Core/Compression/HierarchicalZipWriter.cpp
       ${ORTHANC_ROOT}/Core/Compression/ZipWriter.cpp
       ${ORTHANC_ROOT}/Core/FileStorage/StorageAccessor.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()
 endif()
@@ -561,7 +557,15 @@
 
   ${ORTHANC_ROOT}/Resources/ThirdParty/md5/md5.c
   ${ORTHANC_ROOT}/Resources/ThirdParty/base64/base64.cpp
-  )  
+  )
+
+if (ENABLE_ZLIB AND NOT ORTHANC_SANDBOXED)
+  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