Mercurial > hg > orthanc-stone

diff Resources/CMake/OrthancStoneConfiguration.cmake @ 1504:d8af188ab545

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
sync
author Sebastien Jodogne <s.jodogne@gmail.com>
date Tue, 30 Jun 2020 20:35:16 +0200
parents e5729dab3f67
children b7210c688ca7
line wrap: on
line diff
--- a/Resources/CMake/OrthancStoneConfiguration.cmake	Tue Jun 30 11:38:13 2020 +0200
+++ b/Resources/CMake/OrthancStoneConfiguration.cmake	Tue Jun 30 20:35:16 2020 +0200
@@ -30,10 +30,9 @@
   endif()
 endif()
 
-include(${ORTHANC_ROOT}/Resources/CMake/OrthancFrameworkConfiguration.cmake)
+include(${ORTHANC_FRAMEWORK_ROOT}/Resources/CMake/OrthancFrameworkConfiguration.cmake)
 include_directories(
-  ${ORTHANC_ROOT}/Core
-  ${ORTHANC_ROOT}/Plugins/Samples/Common
+  ${ORTHANC_FRAMEWORK_ROOT}/Sources/
   )
 
 
@@ -104,7 +103,7 @@
 
 if (NOT ORTHANC_SANDBOXED)
   list(APPEND ORTHANC_STONE_SOURCES
-    ${ORTHANC_ROOT}/Plugins/Samples/Common/OrthancHttpConnection.cpp
+    ${ORTHANC_STONE_ROOT}/Framework/Toolbox/OrthancDatasets/OrthancHttpConnection.cpp
     )
 endif()
 
@@ -272,12 +271,10 @@
 
 
 list(APPEND ORTHANC_STONE_SOURCES
-
-  ${ORTHANC_ROOT}/Plugins/Samples/Common/DicomDatasetReader.cpp
-  ${ORTHANC_ROOT}/Plugins/Samples/Common/DicomPath.cpp
-  ${ORTHANC_ROOT}/Plugins/Samples/Common/DicomTag.cpp
-  ${ORTHANC_ROOT}/Plugins/Samples/Common/FullOrthancDataset.cpp
-  ${ORTHANC_ROOT}/Plugins/Samples/Common/IOrthancConnection.cpp
+  ${ORTHANC_STONE_ROOT}/Framework/Toolbox/OrthancDatasets/DicomDatasetReader.cpp
+  ${ORTHANC_STONE_ROOT}/Framework/Toolbox/OrthancDatasets/DicomPath.cpp
+  ${ORTHANC_STONE_ROOT}/Framework/Toolbox/OrthancDatasets/FullOrthancDataset.cpp
+  ${ORTHANC_STONE_ROOT}/Framework/Toolbox/OrthancDatasets/IOrthancConnection.cpp
 
   ${ORTHANC_STONE_ROOT}/Framework/Fonts/FontRenderer.cpp
   ${ORTHANC_STONE_ROOT}/Framework/Fonts/Glyph.cpp