Mercurial > hg > orthanc

changeset 2782:64e3d4ab158d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
find sandboxed builds
author Sebastien Jodogne <s.jodogne@gmail.com>
date Tue, 24 Jul 2018 10:39:08 +0200
parents 13038d638097
children 65699fcb4e99
files Resources/CMake/BoostConfiguration.cmake Resources/CMake/JsonCppConfiguration.cmake Resources/CMake/OrthancFrameworkConfiguration.cmake
diffstat 3 files changed, 14 insertions(+), 15 deletions(-) [+]
line wrap: on
line diff
--- a/Resources/CMake/BoostConfiguration.cmake	Fri Jul 20 11:01:33 2018 +0200
+++ b/Resources/CMake/BoostConfiguration.cmake	Tue Jul 24 10:39:08 2018 +0200
@@ -127,7 +127,8 @@
       CMAKE_SYSTEM_NAME STREQUAL "OpenBSD" OR
       CMAKE_SYSTEM_NAME STREQUAL "PNaCl" OR
       CMAKE_SYSTEM_NAME STREQUAL "NaCl32" OR
-      CMAKE_SYSTEM_NAME STREQUAL "NaCl64")
+      CMAKE_SYSTEM_NAME STREQUAL "NaCl64" OR
+      CMAKE_SYSTEM_NAME STREQUAL "Android")
     list(APPEND BOOST_SOURCES
       ${BOOST_SOURCES_DIR}/libs/atomic/src/lockpool.cpp
       ${BOOST_SOURCES_DIR}/libs/thread/src/pthread/once.cpp
@@ -151,9 +152,6 @@
   elseif (CMAKE_SYSTEM_NAME STREQUAL "Emscripten")
     # No support for threads in asm.js/WebAssembly
 
-  elseif (CMAKE_SYSTEM_NAME STREQUAL "Android")
-    # No support for threads in Android
-
   else()
     message(FATAL_ERROR "Support your platform here")
   endif()
--- a/Resources/CMake/JsonCppConfiguration.cmake	Fri Jul 20 11:01:33 2018 +0200
+++ b/Resources/CMake/JsonCppConfiguration.cmake	Tue Jul 24 10:39:08 2018 +0200
@@ -26,6 +26,10 @@
     ${JSONCPP_SOURCES_DIR}/include
     )
 
+  if (NOT ENABLE_LOCALE)
+    add_definitions(-DJSONCPP_NO_LOCALE_SUPPORT=1)
+  endif()
+    
   source_group(ThirdParty\\JsonCpp REGULAR_EXPRESSION ${JSONCPP_SOURCES_DIR}/.*)
 
 else()
--- 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}