Mercurial > hg > orthanc-stone
changeset 145:6941b98cf0fd wasm
fix
| author | Sebastien Jodogne <s.jodogne@gmail.com> |
|---|---|
| date | Mon, 22 Jan 2018 16:44:52 +0100 |
| parents | 9b83f30fc1c0 |
| children | fb7d602e7025 |
| files | Applications/BasicApplicationContext.h Platforms/Generic/CMakeLists.txt Resources/CMake/OrthancStoneConfiguration.cmake |
| diffstat | 3 files changed, 9 insertions(+), 8 deletions(-) [+] |
line wrap: on
line diff
--- 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 <list> #include <boost/thread.hpp>
--- 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} )
--- 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} )