Mercurial > hg > orthanc-stone

changeset 1355:4971b1c5dfa6 broker

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Added DISABLE_DEPRECATED_FIND_EVENT_TARGET_BEHAVIOR macro to control behavior based on the Emscripten option at runtime. This will be removed once all apps have switched.
author Benjamin Golinvaux <bgo@osimis.io>
date Wed, 15 Apr 2020 14:52:53 +0200
parents c0e4eb14c912
children d8bb885e9b0a
files Samples/WebAssembly/SingleFrameViewer/CMakeLists.txt
diffstat 1 files changed, 4 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/Samples/WebAssembly/SingleFrameViewer/CMakeLists.txt	Wed Apr 15 12:59:15 2020 +0200
+++ b/Samples/WebAssembly/SingleFrameViewer/CMakeLists.txt	Wed Apr 15 14:52:53 2020 +0200
@@ -4,7 +4,7 @@
 # ---------------------------------------------------------------
 set(USE_WASM ON CACHE BOOL "")
 set(ORTHANC_FRAMEWORK_ROOT ${CMAKE_CURRENT_LIST_DIR}/../../../../orthanc CACHE STRING "")
-set(STONE_ROOT ${CMAKE_CURRENT_LIST_DIR}/../../../../orthanc-stone)
+set(STONE_ROOT ${CMAKE_CURRENT_LIST_DIR}/../../../)
 
 set(EMSCRIPTEN_SET_LLVM_WASM_BACKEND ON CACHE BOOL "")
 
@@ -21,6 +21,9 @@
 set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -s ASSERTIONS=1 -s DISABLE_EXCEPTION_CATCHING=0")
 set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -s ALLOW_MEMORY_GROWTH=1 -s TOTAL_MEMORY=268435456")  # 256MB + resize
 set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -s DISABLE_DEPRECATED_FIND_EVENT_TARGET_BEHAVIOR=1")
+add_definitions(
+  -DDISABLE_DEPRECATED_FIND_EVENT_TARGET_BEHAVIOR=1
+)
 
 # Stone of Orthanc configuration
 # ---------------------------------------------------------------