Mercurial > hg > orthanc-stone

changeset 1497:f12b56839496

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
fix docker builds
author Sebastien Jodogne <s.jodogne@gmail.com>
date Thu, 25 Jun 2020 18:33:02 +0200
parents d450653b46d3
children 51d18d6bebd1
files StoneWebViewer/Plugin/docker-build.sh StoneWebViewer/Plugin/docker-internal.sh
diffstat 2 files changed, 4 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/StoneWebViewer/Plugin/docker-build.sh	Thu Jun 25 17:50:36 2020 +0200
+++ b/StoneWebViewer/Plugin/docker-build.sh	Thu Jun 25 18:33:02 2020 +0200
@@ -25,4 +25,4 @@
     -v ${ROOT_DIR}/wasm-binaries:/target:rw ${IMAGE} \
     bash /source/StoneWebViewer/Plugin/docker-internal.sh $1
 
-ls -lR ${ROOT_DIR}/wasm-binaries/StoneWebViewer/
+ls -lR ${ROOT_DIR}/wasm-binaries/share/
--- a/StoneWebViewer/Plugin/docker-internal.sh	Thu Jun 25 17:50:36 2020 +0200
+++ b/StoneWebViewer/Plugin/docker-internal.sh	Thu Jun 25 18:33:02 2020 +0200
@@ -14,12 +14,14 @@
 mkdir /tmp/build
 cd /tmp/build
 
-cmake /tmp/source-writeable/StoneWebViewer/Plugin \
+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 \
       -DORTHANC_FRAMEWORK_ROOT=/tmp/orthanc \
       -DSTATIC_BUILD=ON \
+      -DSTONE_BINARIES=/target/StoneWebViewer/ \
+      -DUSE_LEGACY_JSONCPP=ON \
       -G Ninja
 
 ninja -j2 install