Mercurial > hg > orthanc-stone
changeset 1475:615035c2f3ba
fix GuiAdapter.cpp, removed unused option ENABLE_STONE_DEPRECATED
| author | Sebastien Jodogne <s.jodogne@gmail.com> |
|---|---|
| date | Tue, 16 Jun 2020 10:21:43 +0200 |
| parents | d1dde1f86d4a |
| children | 4db187d29731 |
| files | Deprecated/Applications/Generic/GuiAdapter.cpp Resources/CMake/OrthancStoneParameters.cmake Samples/Sdl/CMakeLists.txt |
| diffstat | 3 files changed, 2 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/Deprecated/Applications/Generic/GuiAdapter.cpp Mon Jun 15 18:21:34 2020 +0200 +++ b/Deprecated/Applications/Generic/GuiAdapter.cpp Tue Jun 16 10:21:43 2020 +0200 @@ -34,7 +34,7 @@ # include "../../../Framework/Deprecated/Messages/LockingEmitter.h" #endif -#include <Core/Compatibility.h> +#include <Compatibility.h> namespace OrthancStone {
--- a/Resources/CMake/OrthancStoneParameters.cmake Mon Jun 15 18:21:34 2020 +0200 +++ b/Resources/CMake/OrthancStoneParameters.cmake Tue Jun 16 10:21:43 2020 +0200 @@ -53,6 +53,4 @@ set(ENABLE_OPENGL ON CACHE BOOL "Enable support of OpenGL") set(ENABLE_WASM OFF CACHE INTERNAL "Enable support of WebAssembly") -set(ENABLE_STONE_DEPRECATED OFF CACHE INTERNAL "Enable backward compatibility with deprecated Stone classes") set(ENABLE_GUIADAPTER OFF CACHE INTERNAL "Enable backward compatibility with the Stone GuiAdapter class") -
--- a/Samples/Sdl/CMakeLists.txt Mon Jun 15 18:21:34 2020 +0200 +++ b/Samples/Sdl/CMakeLists.txt Tue Jun 16 10:21:43 2020 +0200 @@ -22,7 +22,7 @@ set(ENABLE_OPENGL ON) # <== set(ENABLE_WEB_CLIENT ON) set(ORTHANC_SANDBOXED OFF) - + include(${STONE_ROOT}/Resources/CMake/OrthancStoneConfiguration.cmake) include(${CMAKE_SOURCE_DIR}/BoostExtendedConfiguration.cmake) include(${CMAKE_SOURCE_DIR}/Utilities.cmake)