# HG changeset patch # User Sebastien Jodogne # Date 1516635892 -3600 # Node ID 6941b98cf0fd6745497fb3814498e2f40ee2b7c4 # Parent 9b83f30fc1c0299fc1329ff09ee7ce6dc21b8ab7 fix diff -r 9b83f30fc1c0 -r 6941b98cf0fd Applications/BasicApplicationContext.h --- a/Applications/BasicApplicationContext.h Mon Jan 22 15:55:03 2018 +0100 +++ b/Applications/BasicApplicationContext.h Mon Jan 22 16:44:52 2018 +0100 @@ -21,11 +21,11 @@ #pragma once -#include "../../Framework/Viewport/WidgetViewport.h" -#include "../../Framework/Volumes/ISlicedVolume.h" -#include "../../Framework/Volumes/IVolumeLoader.h" -#include "../../Framework/Widgets/IWorldSceneInteractor.h" -#include "../../Platforms/Generic/OracleWebService.h" +#include "../Framework/Viewport/WidgetViewport.h" +#include "../Framework/Volumes/ISlicedVolume.h" +#include "../Framework/Volumes/IVolumeLoader.h" +#include "../Framework/Widgets/IWorldSceneInteractor.h" +#include "../Platforms/Generic/OracleWebService.h" #include #include diff -r 9b83f30fc1c0 -r 6941b98cf0fd Platforms/Generic/CMakeLists.txt --- a/Platforms/Generic/CMakeLists.txt Mon Jan 22 15:55:03 2018 +0100 +++ b/Platforms/Generic/CMakeLists.txt Mon Jan 22 16:44:52 2018 +0100 @@ -8,18 +8,17 @@ include(../../Resources/CMake/OrthancStoneParameters.cmake) +LIST(APPEND ORTHANC_BOOST_COMPONENTS program_options) + SET(ORTHANC_SANDBOXED OFF) -LIST(APPEND 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) -include(../../Resources/CMake/BoostExtendedConfiguration.cmake) add_library(OrthancStone STATIC ${ORTHANC_STONE_SOURCES} - ${BOOST_EXTENDED_SOURCES} ) diff -r 9b83f30fc1c0 -r 6941b98cf0fd Resources/CMake/OrthancStoneConfiguration.cmake --- a/Resources/CMake/OrthancStoneConfiguration.cmake Mon Jan 22 15:55:03 2018 +0100 +++ b/Resources/CMake/OrthancStoneConfiguration.cmake Mon Jan 22 16:44:52 2018 +0100 @@ -212,6 +212,7 @@ ${ORTHANC_ROOT}/Plugins/Samples/Common/FullOrthancDataset.cpp ${PLATFORM_SOURCES} + ${APPLICATIONS_SOURCES} ${ORTHANC_CORE_SOURCES} ${AUTOGENERATED_SOURCES} @@ -221,4 +222,5 @@ # Optional components ${SDL_SOURCES} + ${BOOST_EXTENDED_SOURCES} )