Mercurial > hg > orthanc
diff Resources/CMake/OrthancFrameworkConfiguration.cmake @ 2782:64e3d4ab158d
find sandboxed builds
author | Sebastien Jodogne <s.jodogne@gmail.com> |
---|---|
date | Tue, 24 Jul 2018 10:39:08 +0200 |
parents | 83c991aeb611 |
children | 167105b5b48e |
line wrap: on
line diff
--- a/Resources/CMake/OrthancFrameworkConfiguration.cmake Fri Jul 20 11:01:33 2018 +0200 +++ b/Resources/CMake/OrthancFrameworkConfiguration.cmake Tue Jul 24 10:39:08 2018 +0200 @@ -293,16 +293,22 @@ list(APPEND ORTHANC_CORE_SOURCES_INTERNAL ${ORTHANC_ROOT}/Core/Compression/DeflateBaseCompressor.cpp - ${ORTHANC_ROOT}/Core/Compression/HierarchicalZipWriter.cpp ${ORTHANC_ROOT}/Core/Compression/GzipCompressor.cpp - ${ORTHANC_ROOT}/Core/Compression/ZipWriter.cpp ${ORTHANC_ROOT}/Core/Compression/ZlibCompressor.cpp ) if (NOT ORTHANC_SANDBOXED) list(APPEND ORTHANC_CORE_SOURCES_INTERNAL + ${ORTHANC_ROOT}/Core/Compression/HierarchicalZipWriter.cpp + ${ORTHANC_ROOT}/Core/Compression/ZipWriter.cpp ${ORTHANC_ROOT}/Core/FileStorage/StorageAccessor.cpp ) + + 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() endif() @@ -560,15 +566,6 @@ ) -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}