# HG changeset patch # User Sebastien Jodogne # Date 1505919778 -7200 # Node ID f598ffb81cda00ad31445130681b2c479f01b64b # Parent 3541fc81331a98d1b20254302db9e51619b1fc0e fix sandboxed build diff -r 3541fc81331a -r f598ffb81cda Platforms/Generic/CMakeLists.txt --- a/Platforms/Generic/CMakeLists.txt Wed Sep 20 16:11:52 2017 +0200 +++ b/Platforms/Generic/CMakeLists.txt Wed Sep 20 17:02:58 2017 +0200 @@ -6,8 +6,16 @@ ## Build a static library containing the Orthanc Stone framework ##################################################################### -SET(STONE_SANDBOXED OFF) -include(../../Resources/CMake/OrthancStone.cmake) +include(../../Resources/CMake/OrthancStoneParameters.cmake) + +SET(ORTHANC_SANDBOXED OFF) +SET(ORTHANC_BOOST_COMPONENTS program_options) +SET(ENABLE_CRYPTO_OPTIONS ON) +SET(ENABLE_GOOGLE_TEST ON) +SET(ENABLE_WEB_CLIENT ON) + +include(../../Resources/CMake/OrthancStoneConfiguration.cmake) + add_library(OrthancStone STATIC ${ORTHANC_STONE_SOURCES}) diff -r 3541fc81331a -r f598ffb81cda Platforms/WebAssembly/CMakeLists.txt --- a/Platforms/WebAssembly/CMakeLists.txt Wed Sep 20 16:11:52 2017 +0200 +++ b/Platforms/WebAssembly/CMakeLists.txt Wed Sep 20 17:02:58 2017 +0200 @@ -6,7 +6,7 @@ ##################################################################### -## Configuration of Emscripten for WebAssembly target +## Configuration of the Emscripten compiler for WebAssembly target ##################################################################### set(WASM_FLAGS "-s WASM=1") @@ -24,15 +24,24 @@ #set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -s DEMANGLE_SUPPORT=1 -s ASSERTIONS=2") - ##################################################################### ## Build a static library containing the Orthanc Stone framework ##################################################################### -SET(STONE_SANDBOXED ON) -include(../../Resources/CMake/OrthancStone.cmake) +include(../../Resources/CMake/OrthancStoneParameters.cmake) + +SET(ORTHANC_SANDBOXED ON) +SET(ENABLE_SDL OFF) + +include(../../Resources/CMake/OrthancStoneConfiguration.cmake) + add_library(OrthancStone STATIC ${ORTHANC_STONE_SOURCES}) + + + + + # Regenerate a dummy "library.c" file each time the "library.js" file # is modified, so as to force a new execution of the linking add_custom_command( diff -r 3541fc81331a -r f598ffb81cda Resources/CMake/OrthancStone.cmake --- a/Resources/CMake/OrthancStone.cmake Wed Sep 20 16:11:52 2017 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,260 +0,0 @@ -# Stone of Orthanc -# Copyright (C) 2012-2016 Sebastien Jodogne, Medical Physics -# Department, University Hospital of Liege, Belgium -# Copyright (C) 2017 Osimis, Belgium -# -# This program is free software: you can redistribute it and/or -# modify it under the terms of the GNU Affero General Public License -# as published by the Free Software Foundation, either version 3 of -# the License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# Affero General Public License for more details. -# -# You should have received a copy of the GNU Affero General Public License -# along with this program. If not, see . - - - -##################################################################### -## Import the parameters of the Orthanc Framework -##################################################################### - -# TODO => Import -SET(ORTHANC_ROOT /home/jodogne/Subversion/orthanc) - -include(${ORTHANC_ROOT}/Resources/CMake/OrthancFrameworkParameters.cmake) - -# Optional components of the Orthanc Framework -SET(ENABLE_CURL ON CACHE BOOL "Include support for libcurl") -SET(ENABLE_SSL OFF CACHE BOOL "Include support for SSL") -SET(ENABLE_LOGGING ON CACHE BOOL "Enable logging facilities from Orthanc") - - - -##################################################################### -## Parameters of the Stone of Orthanc -##################################################################### - -# Generic parameters -SET(STONE_SANDBOXED OFF CACHE BOOL "Whether Stone runs inside a sandboxed environment (such as Google NaCl or WebAssembly)") - -# Optional components of Stone -SET(ENABLE_SDL ON CACHE BOOL "Include support for SDL") - -# Advanced parameters to fine-tune linking against system libraries -SET(USE_SYSTEM_CAIRO ON CACHE BOOL "Use the system version of Cairo") -SET(USE_SYSTEM_PIXMAN ON CACHE BOOL "Use the system version of Pixman") -SET(USE_SYSTEM_SDL ON CACHE BOOL "Use the system version of SDL2") - - -##################################################################### -## Configure the Orthanc Framework -##################################################################### - -if (STONE_SANDBOXED) - UNSET(ENABLE_CURL CACHE) - UNSET(ENABLE_LOGGING CACHE) - UNSET(ENABLE_SDL CACHE) -else() - SET(ORTHANC_BOOST_COMPONENTS program_options) - SET(ENABLE_CRYPTO_OPTIONS ON) - SET(ENABLE_WEB_CLIENT ON) -endif() - -SET(ENABLE_GOOGLE_TEST ON) -SET(ENABLE_JPEG ON) -SET(ENABLE_PNG ON) - -include(${ORTHANC_ROOT}/Resources/CMake/OrthancFrameworkConfiguration.cmake) - -include_directories(${ORTHANC_ROOT}) - - -##################################################################### -## Configure mandatory third-party components -##################################################################### - -SET(ORTHANC_STONE_DIR ${CMAKE_CURRENT_LIST_DIR}/../..) - -include(FindPkgConfig) -include(${CMAKE_CURRENT_LIST_DIR}/BoostExtendedConfiguration.cmake) -include(${CMAKE_CURRENT_LIST_DIR}/CairoConfiguration.cmake) -include(${CMAKE_CURRENT_LIST_DIR}/PixmanConfiguration.cmake) - -if (MSVC) - # Remove some warnings on Visual Studio 2015 - add_definitions(-D_SCL_SECURE_NO_WARNINGS=1) -endif() - - -##################################################################### -## Configure optional third-party components -##################################################################### - -if (STONE_SANDBOXED) - if (ENABLE_CURL) - message(FATAL_ERROR "Cannot enable curl in sandboxed environments") - endif() - - if (ENABLE_LOGGING) - message(FATAL_ERROR "Cannot enable logging in sandboxed environments") - endif() - - if (ENABLE_SDL) - message(FATAL_ERROR "Cannot enable SDL in sandboxed environments") - endif() - - if (ENABLE_SSL) - message(FATAL_ERROR "Cannot enable SSL in sandboxed environments") - endif() - - add_definitions( - -DORTHANC_SANDBOXED=1 - ) - -else() - list(APPEND ORTHANC_STONE_SOURCES - ${ORTHANC_ROOT}/Plugins/Samples/Common/OrthancHttpConnection.cpp - ) - - add_definitions( - -DORTHANC_SANDBOXED=0 - ) -endif() - - -if (ENABLE_SDL) - include(${CMAKE_CURRENT_LIST_DIR}/SdlConfiguration.cmake) - add_definitions(-DORTHANC_ENABLE_SDL=1) -else() - add_definitions(-DORTHANC_ENABLE_SDL=0) -endif() - - -add_definitions( - -DHAS_ORTHANC_EXCEPTION=1 - -DORTHANC_ENABLE_LOGGING_PLUGIN=0 - ) - - - - -##################################################################### -## Embed the colormaps into the binaries -##################################################################### - -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 - ) - - - -##################################################################### -## System-specific patches -##################################################################### - -if (${CMAKE_SYSTEM_NAME} STREQUAL "Windows" AND - NOT MSVC AND - ENABLE_SDL) - # This is necessary when compiling EXE for Windows using MinGW - link_libraries(mingw32) -endif() - -if (STONE_SANDBOXED) - # Remove functions not suitable for a sandboxed environment - list(REMOVE_ITEM ORTHANC_CORE_SOURCES - ${ZLIB_SOURCES_DIR}/gzlib.c - ${ZLIB_SOURCES_DIR}/gzwrite.c - ${ZLIB_SOURCES_DIR}/gzread.c - ) -endif() - - - -##################################################################### -## All the source files required to build Stone of Orthanc -##################################################################### - -if (NOT STONE_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 - ) - - 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/SdlSurface.cpp - ${ORTHANC_STONE_DIR}/Applications/Sdl/SdlWindow.cpp - ) -endif() - -list(APPEND ORTHANC_STONE_SOURCES - #${ORTHANC_STONE_DIR}/Framework/Layers/DicomStructureSetRendererFactory.cpp - #${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/Layers/CircleMeasureTracker.cpp - ${ORTHANC_STONE_DIR}/Framework/Layers/ColorFrameRenderer.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/GeometryToolbox.cpp - ${ORTHANC_STONE_DIR}/Framework/Toolbox/MessagingToolbox.cpp - ${ORTHANC_STONE_DIR}/Framework/Toolbox/OrthancSeriesLoader.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/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/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_ROOT}/Plugins/Samples/Common/DicomPath.cpp - ${ORTHANC_ROOT}/Plugins/Samples/Common/IOrthancConnection.cpp - ${ORTHANC_ROOT}/Plugins/Samples/Common/DicomDatasetReader.cpp - ${ORTHANC_ROOT}/Plugins/Samples/Common/FullOrthancDataset.cpp - - ${PLATFORM_SOURCES} - ${ORTHANC_CORE_SOURCES} - ${AUTOGENERATED_SOURCES} - - # Mandatory components - ${CAIRO_SOURCES} - ${PIXMAN_SOURCES} - - # Optional components - ${SDL_SOURCES} - ) diff -r 3541fc81331a -r f598ffb81cda Resources/CMake/OrthancStoneConfiguration.cmake --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/Resources/CMake/OrthancStoneConfiguration.cmake Wed Sep 20 17:02:58 2017 +0200 @@ -0,0 +1,221 @@ +# Stone of Orthanc +# Copyright (C) 2012-2016 Sebastien Jodogne, Medical Physics +# Department, University Hospital of Liege, Belgium +# Copyright (C) 2017 Osimis, Belgium +# +# This program is free software: you can redistribute it and/or +# modify it under the terms of the GNU Affero General Public License +# as published by the Free Software Foundation, either version 3 of +# the License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# Affero General Public License for more details. +# +# You should have received a copy of the GNU Affero General Public License +# along with this program. If not, see . + + + +##################################################################### +## Configure the Orthanc Framework +##################################################################### + +SET(ENABLE_JPEG ON) +SET(ENABLE_PNG ON) + +include(${ORTHANC_ROOT}/Resources/CMake/OrthancFrameworkConfiguration.cmake) + +include_directories(${ORTHANC_ROOT}) + + +##################################################################### +## Sanity check of the configuration +##################################################################### + +if (ORTHANC_SANDBOXED) + if (ENABLE_CURL) + message(FATAL_ERROR "Cannot enable curl in sandboxed environments") + endif() + + if (ENABLE_LOGGING) + message(FATAL_ERROR "Cannot enable logging in sandboxed environments") + endif() + + if (ENABLE_SDL) + message(FATAL_ERROR "Cannot enable SDL in sandboxed environments") + endif() + + if (ENABLE_SSL) + message(FATAL_ERROR "Cannot enable SSL in sandboxed environments") + endif() +endif() + + +##################################################################### +## Configure mandatory third-party components +##################################################################### + +SET(ORTHANC_STONE_DIR ${CMAKE_CURRENT_LIST_DIR}/../..) + +include(FindPkgConfig) +include(${CMAKE_CURRENT_LIST_DIR}/BoostExtendedConfiguration.cmake) +include(${CMAKE_CURRENT_LIST_DIR}/CairoConfiguration.cmake) +include(${CMAKE_CURRENT_LIST_DIR}/PixmanConfiguration.cmake) + + + +##################################################################### +## Configure optional third-party components +##################################################################### + +if (NOT ORTHANC_SANDBOXED) + list(APPEND ORTHANC_STONE_SOURCES + ${ORTHANC_ROOT}/Plugins/Samples/Common/OrthancHttpConnection.cpp + ) +endif() + + +if (ENABLE_SDL) + include(${CMAKE_CURRENT_LIST_DIR}/SdlConfiguration.cmake) + add_definitions(-DORTHANC_ENABLE_SDL=1) +else() + unset(USE_SYSTEM_SDL CACHE) + add_definitions(-DORTHANC_ENABLE_SDL=0) +endif() + + + +##################################################################### +## Configuration of the C/C++ macros +##################################################################### + +if (MSVC) + # Remove some warnings on Visual Studio 2015 + add_definitions(-D_SCL_SECURE_NO_WARNINGS=1) +endif() + +add_definitions( + -DHAS_ORTHANC_EXCEPTION=1 + -DORTHANC_ENABLE_LOGGING_PLUGIN=0 + ) + + + +##################################################################### +## Embed the colormaps into the binaries +##################################################################### + +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 + ) + + + +##################################################################### +## System-specific patches +##################################################################### + +if (${CMAKE_SYSTEM_NAME} STREQUAL "Windows" AND + NOT MSVC AND + ENABLE_SDL) + # This is necessary when compiling EXE for Windows using MinGW + link_libraries(mingw32) +endif() + +if (ORTHANC_SANDBOXED) + # Remove functions not suitable for a sandboxed environment + list(REMOVE_ITEM ORTHANC_CORE_SOURCES + ${ZLIB_SOURCES_DIR}/gzlib.c + ${ZLIB_SOURCES_DIR}/gzwrite.c + ${ZLIB_SOURCES_DIR}/gzread.c + ) +endif() + + + +##################################################################### +## All the source files required to build Stone of Orthanc +##################################################################### + +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 + ) + + 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/SdlSurface.cpp + ${ORTHANC_STONE_DIR}/Applications/Sdl/SdlWindow.cpp + ) +endif() + +list(APPEND ORTHANC_STONE_SOURCES + #${ORTHANC_STONE_DIR}/Framework/Layers/DicomStructureSetRendererFactory.cpp + #${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/Layers/CircleMeasureTracker.cpp + ${ORTHANC_STONE_DIR}/Framework/Layers/ColorFrameRenderer.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/GeometryToolbox.cpp + ${ORTHANC_STONE_DIR}/Framework/Toolbox/MessagingToolbox.cpp + ${ORTHANC_STONE_DIR}/Framework/Toolbox/OrthancSeriesLoader.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/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/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_ROOT}/Plugins/Samples/Common/DicomPath.cpp + ${ORTHANC_ROOT}/Plugins/Samples/Common/IOrthancConnection.cpp + ${ORTHANC_ROOT}/Plugins/Samples/Common/DicomDatasetReader.cpp + ${ORTHANC_ROOT}/Plugins/Samples/Common/FullOrthancDataset.cpp + + ${PLATFORM_SOURCES} + ${ORTHANC_CORE_SOURCES} + ${AUTOGENERATED_SOURCES} + + # Mandatory components + ${CAIRO_SOURCES} + ${PIXMAN_SOURCES} + + # Optional components + ${SDL_SOURCES} + ) diff -r 3541fc81331a -r f598ffb81cda Resources/CMake/OrthancStoneParameters.cmake --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/Resources/CMake/OrthancStoneParameters.cmake Wed Sep 20 17:02:58 2017 +0200 @@ -0,0 +1,46 @@ +# Stone of Orthanc +# Copyright (C) 2012-2016 Sebastien Jodogne, Medical Physics +# Department, University Hospital of Liege, Belgium +# Copyright (C) 2017 Osimis, Belgium +# +# This program is free software: you can redistribute it and/or +# modify it under the terms of the GNU Affero General Public License +# as published by the Free Software Foundation, either version 3 of +# the License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# Affero General Public License for more details. +# +# You should have received a copy of the GNU Affero General Public License +# along with this program. If not, see . + + + +##################################################################### +## Import the parameters of the Orthanc Framework +##################################################################### + +# TODO => Import +SET(ORTHANC_ROOT /home/jodogne/Subversion/orthanc) + +include(${ORTHANC_ROOT}/Resources/CMake/OrthancFrameworkParameters.cmake) + + +##################################################################### +## CMake parameters tunable by the user +##################################################################### + +# Advanced parameters to fine-tune linking against system libraries +SET(USE_SYSTEM_CAIRO ON CACHE BOOL "Use the system version of Cairo") +SET(USE_SYSTEM_PIXMAN ON CACHE BOOL "Use the system version of Pixman") +SET(USE_SYSTEM_SDL ON CACHE BOOL "Use the system version of SDL2") + + +##################################################################### +## Internal CMake parameters to enable the optional subcomponents of +## the Stone of Orthanc +##################################################################### + +SET(ENABLE_SDL ON CACHE INTERNAL "Include support for SDL")