# HG changeset patch
# User Sebastien Jodogne <s.jodogne@gmail.com>
# Date 1624432227 -7200
# Node ID c01ed7a7c11fd0d16fd77d38ab89371cfd9de589
# Parent  d7ac540e0149063742ebcf045df888f3aa39393e
improved CMakeLists.txt

diff -r d7ac540e0149 -r c01ed7a7c11f Applications/Samples/RtViewerPlugin/CMakeLists.txt
--- a/Applications/Samples/RtViewerPlugin/CMakeLists.txt	Thu Jun 17 17:00:36 2021 +0200
+++ b/Applications/Samples/RtViewerPlugin/CMakeLists.txt	Wed Jun 23 09:10:27 2021 +0200
@@ -51,8 +51,6 @@
 # Download and setup the Orthanc framework
 include(${CMAKE_SOURCE_DIR}/../../../OrthancStone/Resources/Orthanc/CMake/DownloadOrthancFramework.cmake)
 
-include_directories(${ORTHANC_FRAMEWORK_ROOT})
-
 if (ORTHANC_FRAMEWORK_SOURCE STREQUAL "system")
   if (ORTHANC_FRAMEWORK_USE_SHARED)
     include(FindBoost)
@@ -69,10 +67,13 @@
 
 else()
   include(${ORTHANC_FRAMEWORK_ROOT}/../Resources/CMake/OrthancFrameworkParameters.cmake)
+
   set(ENABLE_MODULE_IMAGES OFF)
   set(ENABLE_MODULE_JOBS OFF)
   set(ENABLE_MODULE_DICOM OFF)
+
   include(${ORTHANC_FRAMEWORK_ROOT}/../Resources/CMake/OrthancFrameworkConfiguration.cmake)
+  include_directories(${ORTHANC_FRAMEWORK_ROOT})
 endif()
 
 include(${CMAKE_SOURCE_DIR}/../../Resources/Orthanc/Plugins/OrthancPluginsExports.cmake)
diff -r d7ac540e0149 -r c01ed7a7c11f Applications/StoneWebViewer/Plugin/CMakeLists.txt
--- a/Applications/StoneWebViewer/Plugin/CMakeLists.txt	Thu Jun 17 17:00:36 2021 +0200
+++ b/Applications/StoneWebViewer/Plugin/CMakeLists.txt	Wed Jun 23 09:10:27 2021 +0200
@@ -43,8 +43,6 @@
 # Download and setup the Orthanc framework
 include(${CMAKE_SOURCE_DIR}/../../../OrthancStone/Resources/Orthanc/CMake/DownloadOrthancFramework.cmake)
 
-include_directories(${ORTHANC_FRAMEWORK_ROOT})
-
 if (ORTHANC_FRAMEWORK_SOURCE STREQUAL "system")
   if (ORTHANC_FRAMEWORK_USE_SHARED)
     include(FindBoost)
@@ -61,10 +59,13 @@
 
 else()
   include(${ORTHANC_FRAMEWORK_ROOT}/../Resources/CMake/OrthancFrameworkParameters.cmake)
+
   set(ENABLE_MODULE_IMAGES OFF)
   set(ENABLE_MODULE_JOBS OFF)
   set(ENABLE_MODULE_DICOM OFF)
+
   include(${ORTHANC_FRAMEWORK_ROOT}/../Resources/CMake/OrthancFrameworkConfiguration.cmake)
+  include_directories(${ORTHANC_FRAMEWORK_ROOT})
 endif()
 
 include(${CMAKE_SOURCE_DIR}/../../Resources/Orthanc/Plugins/OrthancPluginsExports.cmake)