Mercurial > hg > orthanc

changeset 6624:bc0fce665a1c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
fix wasm builds
author Sebastien Jodogne <s.jodogne@gmail.com>
date Tue, 17 Mar 2026 08:54:41 +0100
parents 241f2169c029
children 7f44bfb58e7c
files OrthancFramework/Resources/CMake/MinizipConfiguration.cmake OrthancFramework/Resources/CMake/OrthancFrameworkConfiguration.cmake
diffstat 2 files changed, 6 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/OrthancFramework/Resources/CMake/MinizipConfiguration.cmake	Tue Mar 17 08:43:21 2026 +0100
+++ b/OrthancFramework/Resources/CMake/MinizipConfiguration.cmake	Tue Mar 17 08:54:41 2026 +0100
@@ -20,11 +20,13 @@
 # <http://www.gnu.org/licenses/>.
 
 
-if (NOT ENABLE_ZLIB OR ORTHANC_SANDBOXED)
-  message(FATAL_ERROR "This file cannot be used if zlib is disabled or if targeting WebAssembly")
+if (NOT ENABLE_ZLIB)
+  message(FATAL_ERROR "This file cannot be used if zlib is disabled")
 endif()
 
-if (STATIC_BUILD OR NOT USE_SYSTEM_MINIZIP)
+if (STATIC_BUILD OR
+    ORTHANC_SANDBOXED OR   # For WebAssembly
+    NOT USE_SYSTEM_MINIZIP)
   add_definitions(-DORTHANC_USE_SYSTEM_MINIZIP=0)
 
   list(APPEND ORTHANC_CORE_SOURCES_DEPENDENCIES
--- a/OrthancFramework/Resources/CMake/OrthancFrameworkConfiguration.cmake	Tue Mar 17 08:43:21 2026 +0100
+++ b/OrthancFramework/Resources/CMake/OrthancFrameworkConfiguration.cmake	Tue Mar 17 08:54:41 2026 +0100
@@ -752,7 +752,7 @@
   ${CMAKE_CURRENT_LIST_DIR}/../../Resources/ThirdParty/base64/base64.cpp
   )
 
-if (ENABLE_ZLIB AND NOT ORTHANC_SANDBOXED)
+if (ENABLE_ZLIB)
   # This is the minizip distribution to create/decode ZIP files using zlib
   include(${CMAKE_CURRENT_LIST_DIR}/MinizipConfiguration.cmake)
 endif()