Mercurial > hg > orthanc-stone

changeset 1505:15f2edef7e7c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
fix
author Sebastien Jodogne <s.jodogne@gmail.com>
date Tue, 30 Jun 2020 21:16:05 +0200
parents d8af188ab545
children f88265c3f8a0
files Samples/WebAssembly/docker-internal.sh StoneWebViewer/Plugin/CMakeLists.txt StoneWebViewer/Plugin/docker-internal.sh StoneWebViewer/WebAssembly/docker-internal.sh
diffstat 4 files changed, 6 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- a/Samples/WebAssembly/docker-internal.sh	Tue Jun 30 20:35:16 2020 +0200
+++ b/Samples/WebAssembly/docker-internal.sh	Tue Jun 30 21:16:05 2020 +0200
@@ -23,7 +23,7 @@
       -DCMAKE_BUILD_TYPE=$1 \
       -DCMAKE_INSTALL_PREFIX=/target \
       -DCMAKE_TOOLCHAIN_FILE=${EMSDK}/upstream/emscripten/cmake/Modules/Platform/Emscripten.cmake \
-      -DORTHANC_FRAMEWORK_ROOT=/tmp/orthanc \
+      -DORTHANC_FRAMEWORK_ROOT=/tmp/orthanc/OrthancFramework \
       -DSTATIC_BUILD=ON \
       -G Ninja
 
--- a/StoneWebViewer/Plugin/CMakeLists.txt	Tue Jun 30 20:35:16 2020 +0200
+++ b/StoneWebViewer/Plugin/CMakeLists.txt	Tue Jun 30 21:16:05 2020 +0200
@@ -5,7 +5,7 @@
 set(ORTHANC_PLUGIN_VERSION "mainline")
 
 
-set(ORTHANC_FRAMEWORK_ROOT ${CMAKE_CURRENT_LIST_DIR}/../../../orthanc CACHE PATH "")
+set(ORTHANC_FRAMEWORK_ROOT ${CMAKE_CURRENT_LIST_DIR}/../../../orthanc/OrthancFramework CACHE PATH "")
 set(STONE_BINARIES CACHE PATH "")
 set(USE_SYSTEM_ORTHANC_SDK ON CACHE BOOL "Use the system version of the Orthanc plugin SDK")
 
@@ -16,8 +16,8 @@
 include(${ORTHANC_FRAMEWORK_ROOT}/Resources/CMake/OrthancFrameworkConfiguration.cmake)
 
 include_directories(
-  ${ORTHANC_FRAMEWORK_ROOT}/Core
-  ${ORTHANC_FRAMEWORK_ROOT}/Plugins/Samples/Common
+  ${ORTHANC_FRAMEWORK_ROOT}/Sources
+  ${CMAKE_SOURCE_DIR}/../Resources/Orthanc
   )
 
 
--- a/StoneWebViewer/Plugin/docker-internal.sh	Tue Jun 30 20:35:16 2020 +0200
+++ b/StoneWebViewer/Plugin/docker-internal.sh	Tue Jun 30 21:16:05 2020 +0200
@@ -18,7 +18,7 @@
       -DCMAKE_BUILD_TYPE=$1 \
       -DCMAKE_INSTALL_PREFIX=/target/ \
       -DCMAKE_TOOLCHAIN_FILE=/tmp/orthanc/Resources/LinuxStandardBaseToolchain.cmake \
-      -DORTHANC_FRAMEWORK_ROOT=/tmp/orthanc \
+      -DORTHANC_FRAMEWORK_ROOT=/tmp/orthanc/OrthancFramework \
       -DSTATIC_BUILD=ON \
       -DSTONE_BINARIES=/target/StoneWebViewer/ \
       -DUSE_LEGACY_JSONCPP=ON \
--- a/StoneWebViewer/WebAssembly/docker-internal.sh	Tue Jun 30 20:35:16 2020 +0200
+++ b/StoneWebViewer/WebAssembly/docker-internal.sh	Tue Jun 30 21:16:05 2020 +0200
@@ -23,7 +23,7 @@
       -DCMAKE_BUILD_TYPE=$1 \
       -DCMAKE_INSTALL_PREFIX=/target/StoneWebViewer \
       -DCMAKE_TOOLCHAIN_FILE=${EMSDK}/upstream/emscripten/cmake/Modules/Platform/Emscripten.cmake \
-      -DORTHANC_FRAMEWORK_ROOT=/tmp/orthanc \
+      -DORTHANC_FRAMEWORK_ROOT=/tmp/orthanc/OrthancFramework \
       -DSTATIC_BUILD=ON \
       -G Ninja