Mercurial > hg > orthanc-stone
changeset 859:6845a05f9526
Merge
| author | Benjamin Golinvaux <bgo@osimis.io> |
|---|---|
| date | Mon, 24 Jun 2019 10:31:57 +0200 |
| parents | e3c56d4f863f (current diff) 0c0fc20a6902 (diff) |
| children | 238693c3bc51 f0bf971a1e31 |
| files | Resources/CMake/OrthancStoneConfiguration.cmake |
| diffstat | 5 files changed, 19 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/Applications/Samples/CMakeLists.txt Mon Jun 24 10:31:04 2019 +0200 +++ b/Applications/Samples/CMakeLists.txt Mon Jun 24 10:31:57 2019 +0200 @@ -82,6 +82,7 @@ endif() + ##################################################################### ## Configuration for Orthanc ##################################################################### @@ -100,6 +101,10 @@ set(ORTHANC_FRAMEWORK_ARCHIVE "" CACHE STRING "Path to the Orthanc archive, if ORTHANC_FRAMEWORK_SOURCE is \"archive\"") set(ORTHANC_FRAMEWORK_ROOT "" CACHE STRING "Path to the Orthanc source directory, if ORTHANC_FRAMEWORK_SOURCE is \"path\"") +add_definitions( + -DORTHANC_ENABLE_LOGGING_PLUGIN=0 + ) + ##################################################################### ## Build a static library containing the Orthanc Stone framework
--- a/Applications/Samples/rt-viewer-demo/CMakeLists.txt Mon Jun 24 10:31:04 2019 +0200 +++ b/Applications/Samples/rt-viewer-demo/CMakeLists.txt Mon Jun 24 10:31:57 2019 +0200 @@ -81,6 +81,7 @@ endif() + ##################################################################### ## Configuration for Orthanc ##################################################################### @@ -97,6 +98,10 @@ set(ORTHANC_FRAMEWORK_ARCHIVE "" CACHE STRING "Path to the Orthanc archive, if ORTHANC_FRAMEWORK_SOURCE is \"archive\"") set(ORTHANC_FRAMEWORK_ROOT "" CACHE STRING "Path to the Orthanc source directory, if ORTHANC_FRAMEWORK_SOURCE is \"path\"") +add_definitions( + -DORTHANC_ENABLE_LOGGING_PLUGIN=0 + ) + ##################################################################### ## Build a static library containing the Orthanc Stone framework
--- a/Resources/CMake/OrthancStoneConfiguration.cmake Mon Jun 24 10:31:04 2019 +0200 +++ b/Resources/CMake/OrthancStoneConfiguration.cmake Mon Jun 24 10:31:57 2019 +0200 @@ -185,7 +185,6 @@ add_definitions( -DHAS_ORTHANC_EXCEPTION=1 - -DORTHANC_ENABLE_LOGGING_PLUGIN=0 ) if (CMAKE_BUILD_TYPE STREQUAL "Debug")
--- a/Samples/Sdl/CMakeLists.txt Mon Jun 24 10:31:04 2019 +0200 +++ b/Samples/Sdl/CMakeLists.txt Mon Jun 24 10:31:57 2019 +0200 @@ -47,6 +47,11 @@ include(${CMAKE_SOURCE_DIR}/../../Resources/CMake/OrthancStoneConfiguration.cmake) +add_definitions( + -DORTHANC_ENABLE_LOGGING_PLUGIN=0 + ) + + ##################################################################### ## Build the samples #####################################################################
--- a/Samples/WebAssembly/CMakeLists.txt Mon Jun 24 10:31:04 2019 +0200 +++ b/Samples/WebAssembly/CMakeLists.txt Mon Jun 24 10:31:57 2019 +0200 @@ -60,6 +60,10 @@ include(${CMAKE_SOURCE_DIR}/../../Resources/CMake/OrthancStoneConfiguration.cmake) +add_definitions( + -DORTHANC_ENABLE_LOGGING_PLUGIN=0 + ) + ##################################################################### ## Build the samples