Mercurial > hg > orthanc-stone
diff Applications/Samples/WebAssembly/CMakeLists.txt @ 2081:3ef91da06636
fix compatibility with Emscripten 3.1.47
author | Sebastien Jodogne <s.jodogne@gmail.com> |
---|---|
date | Wed, 11 Oct 2023 16:38:38 +0200 |
parents | 07964689cb0b |
children | a6d5373e471c 352cb0fa57b2 |
line wrap: on
line diff
--- a/Applications/Samples/WebAssembly/CMakeLists.txt Mon Aug 14 10:36:35 2023 +0200 +++ b/Applications/Samples/WebAssembly/CMakeLists.txt Wed Oct 11 16:38:38 2023 +0200 @@ -45,7 +45,7 @@ set(WASM_FLAGS "${WASM_FLAGS} -s SAFE_HEAP=1") endif() -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") @@ -63,6 +63,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 @@ -88,6 +89,9 @@ ${AUTOGENERATED_SOURCES} ) +DefineSourceBasenameForTarget(OrthancStone) + + ################################################################################ # Define the WASM module @@ -103,6 +107,8 @@ ../Common/RtViewerView.h ) +DefineSourceBasenameForTarget(RtViewerWasm) + set_target_properties(RtViewerWasm PROPERTIES COMPILE_FLAGS "${WASM_FLAGS}" @@ -143,6 +149,8 @@ SingleFrameViewer/SingleFrameViewer.cpp ) +DefineSourceBasenameForTarget(SingleFrameViewerWasm) + set_target_properties(SingleFrameViewerWasm PROPERTIES COMPILE_FLAGS "${WASM_FLAGS}" @@ -171,3 +179,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) +