Mercurial > hg > orthanc-stone

changeset 1840:c01ed7a7c11f

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
improved CMakeLists.txt
author Sebastien Jodogne <s.jodogne@gmail.com>
date Wed, 23 Jun 2021 09:10:27 +0200
parents d7ac540e0149
children 6f82cd776cf6
files Applications/Samples/RtViewerPlugin/CMakeLists.txt Applications/StoneWebViewer/Plugin/CMakeLists.txt
diffstat 2 files changed, 6 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- 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)
--- 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)