--- a/Applications/Samples/WebAssembly/CMakeLists.txt	Wed Jul 12 21:21:11 2023 +0200
+++ b/Applications/Samples/WebAssembly/CMakeLists.txt	Wed Oct 11 17:10:45 2023 +0200
@@ -46,7 +46,7 @@
 endif()
 
 set(WASM_LINKER_FLAGS "${WASM_LINKER_FLAGS} -s ENVIRONMENT=web")
-set(WASM_LINKER_FLAGS "${WASM_LINKER_FLAGS} -s EXTRA_EXPORTED_RUNTIME_METHODS='[\"ccall\", \"cwrap\"]'")
+set(WASM_LINKER_FLAGS "${WASM_LINKER_FLAGS} -s EXPORTED_RUNTIME_METHODS='[\"ccall\", \"cwrap\"]'")
 set(WASM_LINKER_FLAGS "${WASM_LINKER_FLAGS} -s ERROR_ON_UNDEFINED_SYMBOLS=1")
 set(WASM_LINKER_FLAGS "${WASM_LINKER_FLAGS} -s ALLOW_MEMORY_GROWTH=1 -s TOTAL_MEMORY=268435456")  # 256MB + resize
 set(WASM_LINKER_FLAGS "${WASM_LINKER_FLAGS} -s DISABLE_DEPRECATED_FIND_EVENT_TARGET_BEHAVIOR=1")
@@ -66,6 +66,7 @@
 SET(ENABLE_DCMTK OFF)  # Not necessary
 SET(ENABLE_GOOGLE_TEST OFF)
 SET(ENABLE_LOCALE ON)  # Necessary for text rendering
+SET(ENABLE_MODULE_JOBS OFF)
 SET(ORTHANC_SANDBOXED ON)
 
 # this will set up the build system for Stone of Orthanc and will
@@ -91,6 +92,9 @@
   ${AUTOGENERATED_SOURCES}
   )
 
+DefineSourceBasenameForTarget(OrthancStone)
+
+
 ################################################################################
 
 # Define the WASM module
@@ -106,6 +110,8 @@
   ../Common/RtViewerView.h
   )
 
+DefineSourceBasenameForTarget(RtViewerWasm)
+
 set_target_properties(RtViewerWasm
   PROPERTIES
   COMPILE_FLAGS "${WASM_FLAGS}"
@@ -146,6 +152,8 @@
   SingleFrameViewer/SingleFrameViewer.cpp
   )
 
+DefineSourceBasenameForTarget(SingleFrameViewerWasm)
+
 set_target_properties(SingleFrameViewerWasm
   PROPERTIES
   COMPILE_FLAGS "${WASM_FLAGS}"
@@ -174,3 +182,10 @@
   ${CMAKE_CURRENT_BINARY_DIR}/SingleFrameViewerWasm.wasm
   DESTINATION ${ORTHANC_STONE_INSTALL_PREFIX}/SingleFrameViewer/
   )
+
+
+# Boost::Math begs for -std=c++14 since Boost 1.82.0
+set_property(TARGET OrthancStone PROPERTY CXX_STANDARD 14)
+set_property(TARGET RtViewerWasm PROPERTY CXX_STANDARD 14)
+set_property(TARGET SingleFrameViewerWasm PROPERTY CXX_STANDARD 14)
+