Mercurial > hg > orthanc-stone

changeset 1592:0d4b11ba86df

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 Fri, 23 Oct 2020 15:15:32 +0200
parents 5887a4f8594b
children b782f78aed42
files Applications/Platforms/WebAssembly/SharedLibrary/CMakeLists.txt Applications/Samples/Sdl/CMakeLists.txt Applications/Samples/WebAssembly/CMakeLists.txt Applications/StoneWebViewer/WebAssembly/CMakeLists.txt
diffstat 4 files changed, 10 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- a/Applications/Platforms/WebAssembly/SharedLibrary/CMakeLists.txt	Fri Oct 23 13:15:03 2020 +0200
+++ b/Applications/Platforms/WebAssembly/SharedLibrary/CMakeLists.txt	Fri Oct 23 15:15:32 2020 +0200
@@ -18,6 +18,7 @@
 
 
 cmake_minimum_required(VERSION 2.8.3)
+cmake_policy(SET CMP0058 NEW)
 
 project(OrthancStoneModule)
 
@@ -29,7 +30,7 @@
 message("")
 
 
-set(ORTHANC_STONE_INSTALL_PREFIX "${CMAKE_SOURCE_DIR}/../../../wasm-binaries/OrthancStoneModule" CACHE PATH "Where to put the WebAssembly binaries")
+set(ORTHANC_STONE_INSTALL_PREFIX "${CMAKE_SOURCE_DIR}/../../../../wasm-binaries/OrthancStoneModule" CACHE PATH "Where to put the WebAssembly binaries")
 
 
 # Ask for the generation of a side module
@@ -80,9 +81,9 @@
 #  $ grep -lrE 'emscripten_' ../../Sources/
 
 set(SOURCES_WITH_EMSCRIPTEN_CALLBACKS
-  ${ORTHANC_STONE_ROOT}/Sources/Oracle/WebAssemblyOracle.cpp
-  ${ORTHANC_STONE_ROOT}/Sources/Viewport/WebAssemblyViewport.cpp
-  ${ORTHANC_STONE_ROOT}/Sources/Viewport/WebAssemblyCairoViewport.cpp
+  ${CMAKE_SOURCE_DIR}/../WebAssemblyOracle.cpp
+  ${CMAKE_SOURCE_DIR}/../WebAssemblyViewport.cpp
+  ${CMAKE_SOURCE_DIR}/../WebAssemblyCairoViewport.cpp
   )
 
 list(REMOVE_ITEM ORTHANC_STONE_SOURCES
@@ -90,7 +91,7 @@
   )
 
 configure_file(
-  ${CMAKE_SOURCE_DIR}/../OrthancStone.h.in
+  ${ORTHANC_STONE_ROOT}/SharedLibrary/OrthancStone.h.in
   ${CMAKE_CURRENT_BINARY_DIR}/Include/orthanc-stone/OrthancStone.h
   )
 
@@ -100,7 +101,7 @@
   )
 
 file(
-  COPY ${CMAKE_SOURCE_DIR}/../../Sources/
+  COPY ${CMAKE_SOURCE_DIR}/../../../../OrthancStone/Sources/
   DESTINATION ${CMAKE_CURRENT_BINARY_DIR}/Include/orthanc-stone
   NO_SOURCE_PERMISSIONS
   FILES_MATCHING
--- a/Applications/Samples/Sdl/CMakeLists.txt	Fri Oct 23 13:15:03 2020 +0200
+++ b/Applications/Samples/Sdl/CMakeLists.txt	Fri Oct 23 15:15:32 2020 +0200
@@ -18,6 +18,7 @@
 
 
 cmake_minimum_required(VERSION 2.8.10)
+cmake_policy(SET CMP0058 NEW)
 
 project(OrthancStone)
 
--- a/Applications/Samples/WebAssembly/CMakeLists.txt	Fri Oct 23 13:15:03 2020 +0200
+++ b/Applications/Samples/WebAssembly/CMakeLists.txt	Fri Oct 23 15:15:32 2020 +0200
@@ -18,6 +18,7 @@
 
 
 cmake_minimum_required(VERSION 2.8.3)
+cmake_policy(SET CMP0058 NEW)
 
 project(OrthancStone)
 
--- a/Applications/StoneWebViewer/WebAssembly/CMakeLists.txt	Fri Oct 23 13:15:03 2020 +0200
+++ b/Applications/StoneWebViewer/WebAssembly/CMakeLists.txt	Fri Oct 23 15:15:32 2020 +0200
@@ -18,6 +18,7 @@
 
 
 cmake_minimum_required(VERSION 2.8.3)
+cmake_policy(SET CMP0058 NEW)
 
 project(OrthancStone)