Mercurial > hg > orthanc-stone

changeset 215:07792a582de9

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
fix path
author Sebastien Jodogne <s.jodogne@gmail.com>
date Wed, 06 Jun 2018 13:53:21 +0200
parents 1c5a47dda299
children c4ea26865975
files Platforms/Generic/CMakeLists.txt Resources/CMake/OrthancStoneConfiguration.cmake Resources/OrthancStone.doxygen
diffstat 3 files changed, 71 insertions(+), 71 deletions(-) [+]
line wrap: on
line diff
--- a/Platforms/Generic/CMakeLists.txt	Fri Jun 01 18:33:34 2018 +0200
+++ b/Platforms/Generic/CMakeLists.txt	Wed Jun 06 13:53:21 2018 +0200
@@ -47,7 +47,7 @@
 
 macro(BuildSample Target Sample)
   add_executable(${Target}
-    ${ORTHANC_STONE_DIR}/Applications/Samples/SampleMainSdl.cpp
+    ${ORTHANC_STONE_ROOT}/Applications/Samples/SampleMainSdl.cpp
     ${APPLICATIONS_SOURCES}
     )
   set_target_properties(${Target} PROPERTIES COMPILE_DEFINITIONS ORTHANC_STONE_SAMPLE=${Sample})
@@ -72,7 +72,7 @@
 
 add_executable(UnitTests
   ${GOOGLE_TEST_SOURCES}
-  ${ORTHANC_STONE_DIR}/UnitTestsSources/UnitTestsMain.cpp
+  ${ORTHANC_STONE_ROOT}/UnitTestsSources/UnitTestsMain.cpp
   )
 
 target_link_libraries(UnitTests OrthancStone)
@@ -85,7 +85,7 @@
 find_package(Doxygen)
 if (DOXYGEN_FOUND)
   configure_file(
-    ${ORTHANC_STONE_DIR}/Resources/OrthancStone.doxygen
+    ${ORTHANC_STONE_ROOT}/Resources/OrthancStone.doxygen
     ${CMAKE_CURRENT_BINARY_DIR}/OrthancStone.doxygen
     @ONLY)
 
--- a/Resources/CMake/OrthancStoneConfiguration.cmake	Fri Jun 01 18:33:34 2018 +0200
+++ b/Resources/CMake/OrthancStoneConfiguration.cmake	Wed Jun 06 13:53:21 2018 +0200
@@ -49,7 +49,7 @@
 ## Configure mandatory third-party components
 #####################################################################
 
-SET(ORTHANC_STONE_DIR ${CMAKE_CURRENT_LIST_DIR}/../..)
+SET(ORTHANC_STONE_ROOT ${CMAKE_CURRENT_LIST_DIR}/../..)
 
 include(FindPkgConfig)
 include(${CMAKE_CURRENT_LIST_DIR}/BoostExtendedConfiguration.cmake)
@@ -100,11 +100,11 @@
 #####################################################################
 
 EmbedResources(
-  COLORMAP_HOT    ${ORTHANC_STONE_DIR}/Resources/Colormaps/hot.lut
-  COLORMAP_JET    ${ORTHANC_STONE_DIR}/Resources/Colormaps/jet.lut
-  COLORMAP_RED    ${ORTHANC_STONE_DIR}/Resources/Colormaps/red.lut
-  COLORMAP_GREEN  ${ORTHANC_STONE_DIR}/Resources/Colormaps/green.lut
-  COLORMAP_BLUE   ${ORTHANC_STONE_DIR}/Resources/Colormaps/blue.lut
+  COLORMAP_HOT    ${ORTHANC_STONE_ROOT}/Resources/Colormaps/hot.lut
+  COLORMAP_JET    ${ORTHANC_STONE_ROOT}/Resources/Colormaps/jet.lut
+  COLORMAP_RED    ${ORTHANC_STONE_ROOT}/Resources/Colormaps/red.lut
+  COLORMAP_GREEN  ${ORTHANC_STONE_ROOT}/Resources/Colormaps/green.lut
+  COLORMAP_BLUE   ${ORTHANC_STONE_ROOT}/Resources/Colormaps/blue.lut
   )
 
 
@@ -137,72 +137,72 @@
 
 if (NOT ORTHANC_SANDBOXED)
   set(PLATFORM_SOURCES
-    ${ORTHANC_STONE_DIR}/Platforms/Generic/WebServiceGetCommand.cpp
-    ${ORTHANC_STONE_DIR}/Platforms/Generic/WebServicePostCommand.cpp
-    ${ORTHANC_STONE_DIR}/Platforms/Generic/Oracle.cpp
+    ${ORTHANC_STONE_ROOT}/Platforms/Generic/WebServiceGetCommand.cpp
+    ${ORTHANC_STONE_ROOT}/Platforms/Generic/WebServicePostCommand.cpp
+    ${ORTHANC_STONE_ROOT}/Platforms/Generic/Oracle.cpp
     )
 
   set(APPLICATIONS_SOURCES
-    ${ORTHANC_STONE_DIR}/Applications/BasicApplicationContext.cpp
-    ${ORTHANC_STONE_DIR}/Applications/IBasicApplication.cpp
-    ${ORTHANC_STONE_DIR}/Applications/Sdl/SdlEngine.cpp
-    ${ORTHANC_STONE_DIR}/Applications/Sdl/SdlCairoSurface.cpp
-    ${ORTHANC_STONE_DIR}/Applications/Sdl/SdlOrthancSurface.cpp
-    ${ORTHANC_STONE_DIR}/Applications/Sdl/SdlWindow.cpp
+    ${ORTHANC_STONE_ROOT}/Applications/BasicApplicationContext.cpp
+    ${ORTHANC_STONE_ROOT}/Applications/IBasicApplication.cpp
+    ${ORTHANC_STONE_ROOT}/Applications/Sdl/SdlEngine.cpp
+    ${ORTHANC_STONE_ROOT}/Applications/Sdl/SdlCairoSurface.cpp
+    ${ORTHANC_STONE_ROOT}/Applications/Sdl/SdlOrthancSurface.cpp
+    ${ORTHANC_STONE_ROOT}/Applications/Sdl/SdlWindow.cpp
     )
 endif()
 
 list(APPEND ORTHANC_STONE_SOURCES
-  #${ORTHANC_STONE_DIR}/Framework/Layers/SeriesFrameRendererFactory.cpp
-  #${ORTHANC_STONE_DIR}/Framework/Layers/SiblingSliceLocationFactory.cpp
-  #${ORTHANC_STONE_DIR}/Framework/Layers/SingleFrameRendererFactory.cpp
-  ${ORTHANC_STONE_DIR}/Framework/StoneEnumerations.cpp
-  ${ORTHANC_STONE_DIR}/Framework/Layers/CircleMeasureTracker.cpp
-  ${ORTHANC_STONE_DIR}/Framework/Layers/ColorFrameRenderer.cpp
-  ${ORTHANC_STONE_DIR}/Framework/Layers/DicomStructureSetRendererFactory.cpp
-  ${ORTHANC_STONE_DIR}/Framework/Layers/FrameRenderer.cpp
-  ${ORTHANC_STONE_DIR}/Framework/Layers/GrayscaleFrameRenderer.cpp
-  ${ORTHANC_STONE_DIR}/Framework/Layers/LayerSourceBase.cpp
-  ${ORTHANC_STONE_DIR}/Framework/Layers/LineLayerRenderer.cpp
-  ${ORTHANC_STONE_DIR}/Framework/Layers/LineMeasureTracker.cpp
-  ${ORTHANC_STONE_DIR}/Framework/Layers/OrthancFrameLayerSource.cpp
-  ${ORTHANC_STONE_DIR}/Framework/Layers/RenderStyle.cpp
-  ${ORTHANC_STONE_DIR}/Framework/Layers/SliceOutlineRenderer.cpp
-  ${ORTHANC_STONE_DIR}/Framework/Toolbox/CoordinateSystem3D.cpp
-  ${ORTHANC_STONE_DIR}/Framework/Toolbox/DicomFrameConverter.cpp
-  ${ORTHANC_STONE_DIR}/Framework/Toolbox/DicomStructureSet.cpp
-  ${ORTHANC_STONE_DIR}/Framework/Toolbox/DownloadStack.cpp
-  ${ORTHANC_STONE_DIR}/Framework/Toolbox/Extent2D.cpp
-  ${ORTHANC_STONE_DIR}/Framework/Toolbox/FiniteProjectiveCamera.cpp
-  ${ORTHANC_STONE_DIR}/Framework/Toolbox/GeometryToolbox.cpp
-  ${ORTHANC_STONE_DIR}/Framework/Toolbox/ImageGeometry.cpp
-  ${ORTHANC_STONE_DIR}/Framework/Toolbox/LinearAlgebra.cpp
-  ${ORTHANC_STONE_DIR}/Framework/Toolbox/MessagingToolbox.cpp
-  ${ORTHANC_STONE_DIR}/Framework/Toolbox/OrientedBoundingBox.cpp
-  ${ORTHANC_STONE_DIR}/Framework/Toolbox/OrthancSlicesLoader.cpp
-  ${ORTHANC_STONE_DIR}/Framework/Toolbox/ParallelSlices.cpp
-  ${ORTHANC_STONE_DIR}/Framework/Toolbox/ParallelSlicesCursor.cpp
-  ${ORTHANC_STONE_DIR}/Framework/Toolbox/ShearWarpProjectiveTransform.cpp
-  ${ORTHANC_STONE_DIR}/Framework/Toolbox/Slice.cpp
-  ${ORTHANC_STONE_DIR}/Framework/Toolbox/SlicesSorter.cpp
-  ${ORTHANC_STONE_DIR}/Framework/Toolbox/ViewportGeometry.cpp
-  ${ORTHANC_STONE_DIR}/Framework/Viewport/CairoContext.cpp
-  ${ORTHANC_STONE_DIR}/Framework/Viewport/CairoFont.cpp
-  ${ORTHANC_STONE_DIR}/Framework/Viewport/CairoSurface.cpp
-  ${ORTHANC_STONE_DIR}/Framework/Viewport/WidgetViewport.cpp
-  ${ORTHANC_STONE_DIR}/Framework/Volumes/ImageBuffer3D.cpp
-  ${ORTHANC_STONE_DIR}/Framework/Volumes/SlicedVolumeBase.cpp
-  ${ORTHANC_STONE_DIR}/Framework/Volumes/StructureSetLoader.cpp
-  ${ORTHANC_STONE_DIR}/Framework/Volumes/VolumeLoaderBase.cpp
-  ${ORTHANC_STONE_DIR}/Framework/Volumes/VolumeReslicer.cpp
-  ${ORTHANC_STONE_DIR}/Framework/Widgets/CairoWidget.cpp
-  ${ORTHANC_STONE_DIR}/Framework/Widgets/EmptyWidget.cpp
-  ${ORTHANC_STONE_DIR}/Framework/Widgets/LayerWidget.cpp
-  ${ORTHANC_STONE_DIR}/Framework/Widgets/LayoutWidget.cpp
-  ${ORTHANC_STONE_DIR}/Framework/Widgets/TestCairoWidget.cpp
-  ${ORTHANC_STONE_DIR}/Framework/Widgets/TestWorldSceneWidget.cpp
-  ${ORTHANC_STONE_DIR}/Framework/Widgets/WidgetBase.cpp
-  ${ORTHANC_STONE_DIR}/Framework/Widgets/WorldSceneWidget.cpp
+  #${ORTHANC_STONE_ROOT}/Framework/Layers/SeriesFrameRendererFactory.cpp
+  #${ORTHANC_STONE_ROOT}/Framework/Layers/SiblingSliceLocationFactory.cpp
+  #${ORTHANC_STONE_ROOT}/Framework/Layers/SingleFrameRendererFactory.cpp
+  ${ORTHANC_STONE_ROOT}/Framework/StoneEnumerations.cpp
+  ${ORTHANC_STONE_ROOT}/Framework/Layers/CircleMeasureTracker.cpp
+  ${ORTHANC_STONE_ROOT}/Framework/Layers/ColorFrameRenderer.cpp
+  ${ORTHANC_STONE_ROOT}/Framework/Layers/DicomStructureSetRendererFactory.cpp
+  ${ORTHANC_STONE_ROOT}/Framework/Layers/FrameRenderer.cpp
+  ${ORTHANC_STONE_ROOT}/Framework/Layers/GrayscaleFrameRenderer.cpp
+  ${ORTHANC_STONE_ROOT}/Framework/Layers/LayerSourceBase.cpp
+  ${ORTHANC_STONE_ROOT}/Framework/Layers/LineLayerRenderer.cpp
+  ${ORTHANC_STONE_ROOT}/Framework/Layers/LineMeasureTracker.cpp
+  ${ORTHANC_STONE_ROOT}/Framework/Layers/OrthancFrameLayerSource.cpp
+  ${ORTHANC_STONE_ROOT}/Framework/Layers/RenderStyle.cpp
+  ${ORTHANC_STONE_ROOT}/Framework/Layers/SliceOutlineRenderer.cpp
+  ${ORTHANC_STONE_ROOT}/Framework/Toolbox/CoordinateSystem3D.cpp
+  ${ORTHANC_STONE_ROOT}/Framework/Toolbox/DicomFrameConverter.cpp
+  ${ORTHANC_STONE_ROOT}/Framework/Toolbox/DicomStructureSet.cpp
+  ${ORTHANC_STONE_ROOT}/Framework/Toolbox/DownloadStack.cpp
+  ${ORTHANC_STONE_ROOT}/Framework/Toolbox/Extent2D.cpp
+  ${ORTHANC_STONE_ROOT}/Framework/Toolbox/FiniteProjectiveCamera.cpp
+  ${ORTHANC_STONE_ROOT}/Framework/Toolbox/GeometryToolbox.cpp
+  ${ORTHANC_STONE_ROOT}/Framework/Toolbox/ImageGeometry.cpp
+  ${ORTHANC_STONE_ROOT}/Framework/Toolbox/LinearAlgebra.cpp
+  ${ORTHANC_STONE_ROOT}/Framework/Toolbox/MessagingToolbox.cpp
+  ${ORTHANC_STONE_ROOT}/Framework/Toolbox/OrientedBoundingBox.cpp
+  ${ORTHANC_STONE_ROOT}/Framework/Toolbox/OrthancSlicesLoader.cpp
+  ${ORTHANC_STONE_ROOT}/Framework/Toolbox/ParallelSlices.cpp
+  ${ORTHANC_STONE_ROOT}/Framework/Toolbox/ParallelSlicesCursor.cpp
+  ${ORTHANC_STONE_ROOT}/Framework/Toolbox/ShearWarpProjectiveTransform.cpp
+  ${ORTHANC_STONE_ROOT}/Framework/Toolbox/Slice.cpp
+  ${ORTHANC_STONE_ROOT}/Framework/Toolbox/SlicesSorter.cpp
+  ${ORTHANC_STONE_ROOT}/Framework/Toolbox/ViewportGeometry.cpp
+  ${ORTHANC_STONE_ROOT}/Framework/Viewport/CairoContext.cpp
+  ${ORTHANC_STONE_ROOT}/Framework/Viewport/CairoFont.cpp
+  ${ORTHANC_STONE_ROOT}/Framework/Viewport/CairoSurface.cpp
+  ${ORTHANC_STONE_ROOT}/Framework/Viewport/WidgetViewport.cpp
+  ${ORTHANC_STONE_ROOT}/Framework/Volumes/ImageBuffer3D.cpp
+  ${ORTHANC_STONE_ROOT}/Framework/Volumes/SlicedVolumeBase.cpp
+  ${ORTHANC_STONE_ROOT}/Framework/Volumes/StructureSetLoader.cpp
+  ${ORTHANC_STONE_ROOT}/Framework/Volumes/VolumeLoaderBase.cpp
+  ${ORTHANC_STONE_ROOT}/Framework/Volumes/VolumeReslicer.cpp
+  ${ORTHANC_STONE_ROOT}/Framework/Widgets/CairoWidget.cpp
+  ${ORTHANC_STONE_ROOT}/Framework/Widgets/EmptyWidget.cpp
+  ${ORTHANC_STONE_ROOT}/Framework/Widgets/LayerWidget.cpp
+  ${ORTHANC_STONE_ROOT}/Framework/Widgets/LayoutWidget.cpp
+  ${ORTHANC_STONE_ROOT}/Framework/Widgets/TestCairoWidget.cpp
+  ${ORTHANC_STONE_ROOT}/Framework/Widgets/TestWorldSceneWidget.cpp
+  ${ORTHANC_STONE_ROOT}/Framework/Widgets/WidgetBase.cpp
+  ${ORTHANC_STONE_ROOT}/Framework/Widgets/WorldSceneWidget.cpp
 
   ${ORTHANC_ROOT}/Plugins/Samples/Common/DicomPath.cpp
   ${ORTHANC_ROOT}/Plugins/Samples/Common/IOrthancConnection.cpp
--- a/Resources/OrthancStone.doxygen	Fri Jun 01 18:33:34 2018 +0200
+++ b/Resources/OrthancStone.doxygen	Wed Jun 06 13:53:21 2018 +0200
@@ -45,7 +45,7 @@
 # exceed 55 pixels and the maximum width should not exceed 200 pixels.
 # Doxygen will copy the logo to the output directory.
 
-PROJECT_LOGO           = @ORTHANC_STONE_DIR@/Resources/OrthancLogoDocumentation.png
+PROJECT_LOGO           = @ORTHANC_STONE_ROOT@/Resources/OrthancLogoDocumentation.png
 
 # The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute)
 # base path where the generated documentation will be put.
@@ -655,7 +655,7 @@
 # directories like "/usr/src/myproject". Separate the files or directories
 # with spaces.
 
-INPUT                  = @ORTHANC_STONE_DIR@/Framework @ORTHANC_STONE_DIR@/Platforms
+INPUT                  = @ORTHANC_STONE_ROOT@/Framework @ORTHANC_STONE_ROOT@/Platforms
 
 # This tag can be used to specify the character encoding of the source files
 # that doxygen parses. Internally doxygen uses the UTF-8 encoding, which is
@@ -687,7 +687,7 @@
 # Note that relative paths are relative to the directory from which doxygen is
 # run.
 
-EXCLUDE                = @ORTHANC_STONE_DIR@/Framework/Orthanc/Resources/
+EXCLUDE                = @ORTHANC_STONE_ROOT@/Framework/Orthanc/Resources/
 
 # The EXCLUDE_SYMLINKS tag can be used to select whether or not files or
 # directories that are symbolic links (a Unix file system feature) are excluded