# HG changeset patch # User Sebastien Jodogne # Date 1591957954 -7200 # Node ID cf454aabfc197e962ac78dc181802118c2e57992 # Parent 408ac60c3cf8a666f1a62fdad23d7db97412939e improving EmscriptenParameters.cmake diff -r 408ac60c3cf8 -r cf454aabfc19 OrthancFramework/Resources/CMake/EmscriptenParameters.cmake --- a/OrthancFramework/Resources/CMake/EmscriptenParameters.cmake Fri Jun 12 09:29:03 2020 +0200 +++ b/OrthancFramework/Resources/CMake/EmscriptenParameters.cmake Fri Jun 12 12:32:34 2020 +0200 @@ -2,6 +2,8 @@ set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -s BINARYEN_TRAP_MODE='\"${EMSCRIPTEN_TRAP_MODE}\"'") endif() +set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -s DISABLE_EXCEPTION_CATCHING=0") + if (EMSCRIPTEN_TARGET_MODE STREQUAL "wasm") # WebAssembly set(WASM_FLAGS "${WASM_FLAGS} -s WASM=1 -s FETCH=1") @@ -15,7 +17,7 @@ endif() if (CMAKE_BUILD_TYPE STREQUAL "Debug") - set(WASM_FLAGS "${WASM_FLAGS} -s SAFE_HEAP=1") + set(WASM_FLAGS "${WASM_FLAGS} -s SAFE_HEAP=1 -s ASSERTIONS=1") endif() set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${WASM_FLAGS}") diff -r 408ac60c3cf8 -r cf454aabfc19 OrthancFramework/SharedLibrary/NOTES.txt --- a/OrthancFramework/SharedLibrary/NOTES.txt Fri Jun 12 09:29:03 2020 +0200 +++ b/OrthancFramework/SharedLibrary/NOTES.txt Fri Jun 12 12:32:34 2020 +0200 @@ -44,7 +44,7 @@ $ cd wasm $ source ~/Downloads/emsdk/emsdk_env.sh -$ cmake .. -DCMAKE_BUILD_TYPE=Release -G Ninja \ +$ cmake .. -DCMAKE_BUILD_TYPE=Release -DALLOW_DOWNLOADS=ON -G Ninja \ -DCMAKE_TOOLCHAIN_FILE=${EMSDK}/upstream/emscripten/cmake/Modules/Platform/Emscripten.cmake $ ninja -j4