Mercurial > hg > orthanc-stone
changeset 1506:f88265c3f8a0
fix
| author | Sebastien Jodogne <s.jodogne@gmail.com> |
|---|---|
| date | Tue, 30 Jun 2020 22:00:38 +0200 |
| parents | 15f2edef7e7c |
| children | 169adf9090a6 |
| files | Samples/WebAssembly/CMakeLists.txt StoneWebViewer/Plugin/docker-internal.sh |
| diffstat | 2 files changed, 4 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/Samples/WebAssembly/CMakeLists.txt Tue Jun 30 21:16:05 2020 +0200 +++ b/Samples/WebAssembly/CMakeLists.txt Tue Jun 30 22:00:38 2020 +0200 @@ -5,7 +5,7 @@ # Configuration of the Emscripten compiler for WebAssembly target # --------------------------------------------------------------- set(USE_WASM ON CACHE BOOL "") -set(ORTHANC_FRAMEWORK_ROOT ${CMAKE_CURRENT_LIST_DIR}/../../../orthanc CACHE STRING "") +set(ORTHANC_FRAMEWORK_ROOT ${CMAKE_CURRENT_LIST_DIR}/../../../orthanc/OrthancFramework CACHE STRING "") set(STONE_ROOT ${CMAKE_CURRENT_LIST_DIR}/../../) set(EMSCRIPTEN_SET_LLVM_WASM_BACKEND ON CACHE BOOL "") @@ -33,8 +33,8 @@ set(ORTHANC_FRAMEWORK_SOURCE "path") include(${STONE_ROOT}/Resources/CMake/OrthancStoneParameters.cmake) -include(${ORTHANC_ROOT}/Resources/CMake/AutoGeneratedCode.cmake) -include(${ORTHANC_ROOT}/Resources/CMake/DownloadPackage.cmake) +include(${ORTHANC_FRAMEWORK_ROOT}/Resources/CMake/AutoGeneratedCode.cmake) +include(${ORTHANC_FRAMEWORK_ROOT}/Resources/CMake/DownloadPackage.cmake) SET(ENABLE_DCMTK OFF) # Not necessary SET(ENABLE_GOOGLE_TEST OFF)
--- a/StoneWebViewer/Plugin/docker-internal.sh Tue Jun 30 21:16:05 2020 +0200 +++ b/StoneWebViewer/Plugin/docker-internal.sh Tue Jun 30 22:00:38 2020 +0200 @@ -17,7 +17,7 @@ LSB_CC=gcc-4.8 LSB_CXX=g++-4.8 cmake /tmp/source-writeable/StoneWebViewer/Plugin \ -DCMAKE_BUILD_TYPE=$1 \ -DCMAKE_INSTALL_PREFIX=/target/ \ - -DCMAKE_TOOLCHAIN_FILE=/tmp/orthanc/Resources/LinuxStandardBaseToolchain.cmake \ + -DCMAKE_TOOLCHAIN_FILE=/tmp/orthanc/OrthancFramework/Resources/Toolchains/LinuxStandardBaseToolchain.cmake \ -DORTHANC_FRAMEWORK_ROOT=/tmp/orthanc/OrthancFramework \ -DSTATIC_BUILD=ON \ -DSTONE_BINARIES=/target/StoneWebViewer/ \