# HG changeset patch
# User Benjamin Golinvaux <bgo@osimis.io>
# Date 1561365117 -7200
# Node ID 6845a05f95267aefb89779e7c64171746194f606
# Parent  e3c56d4f863fb3afc104cdf75b49a210b234d7ab# Parent  0c0fc20a69027084e45c8926300f6da50b52284b
Merge

diff -r e3c56d4f863f -r 6845a05f9526 Applications/Samples/CMakeLists.txt
--- 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
diff -r e3c56d4f863f -r 6845a05f9526 Applications/Samples/rt-viewer-demo/CMakeLists.txt
--- 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
diff -r e3c56d4f863f -r 6845a05f9526 Resources/CMake/OrthancStoneConfiguration.cmake
--- 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")
diff -r e3c56d4f863f -r 6845a05f9526 Samples/Sdl/CMakeLists.txt
--- 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
 #####################################################################
diff -r e3c56d4f863f -r 6845a05f9526 Samples/WebAssembly/CMakeLists.txt
--- 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