Mercurial > hg > orthanc
changeset 2406:f0cfacd0c9b8
Orthanc framework: ORTHANC_SANDBOXED parameter
| author | Sebastien Jodogne <s.jodogne@gmail.com> |
|---|---|
| date | Wed, 20 Sep 2017 16:28:27 +0200 |
| parents | 85a22aad7dfe |
| children | 5edec967055e |
| files | Resources/CMake/Compiler.cmake Resources/CMake/OrthancFrameworkConfiguration.cmake Resources/CMake/OrthancFrameworkParameters.cmake |
| diffstat | 3 files changed, 13 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/Resources/CMake/Compiler.cmake Fri Sep 15 13:07:06 2017 +0200 +++ b/Resources/CMake/Compiler.cmake Wed Sep 20 16:28:27 2017 +0200 @@ -179,6 +179,9 @@ message(FATAL_ERROR "Please install the uuid-dev package") endif() +elseif (CMAKE_SYSTEM_NAME STREQUAL "Emscripten") + message("Building using Emscripten (for WebAssembly or asm.js targets)") + else() message(FATAL_ERROR "Support your platform here") endif()
--- a/Resources/CMake/OrthancFrameworkConfiguration.cmake Fri Sep 15 13:07:06 2017 +0200 +++ b/Resources/CMake/OrthancFrameworkConfiguration.cmake Wed Sep 20 16:28:27 2017 +0200 @@ -402,11 +402,17 @@ -DORTHANC_ENABLE_LOGGING_PLUGIN=0 -DORTHANC_ENABLE_MD5=1 -DORTHANC_MAXIMUM_TAG_LENGTH=256 - -DORTHANC_SANDBOXED=0 -DORTHANC_VERSION="${ORTHANC_VERSION}" ) +if (ORTHANC_SANDBOXED) + add_definitions(-DORTHANC_SANDBOXED=1) +else() + add_definitions(-DORTHANC_SANDBOXED=0) +endif() + + if (HAS_EMBEDDED_RESOURCES) add_definitions(-DORTHANC_HAS_EMBEDDED_RESOURCES=1)
--- a/Resources/CMake/OrthancFrameworkParameters.cmake Fri Sep 15 13:07:06 2017 +0200 +++ b/Resources/CMake/OrthancFrameworkParameters.cmake Wed Sep 20 16:28:27 2017 +0200 @@ -91,3 +91,6 @@ set(HAS_EMBEDDED_RESOURCES OFF CACHE INTERNAL "Whether resources are auto-generated using EmbedResources.py") + +set(ORTHANC_SANDBOXED OFF CACHE INTERNAL + "Whether Orthanc runs inside a sandboxed environment (such as Google NaCl or WebAssembly)")