Mercurial > hg > orthanc
changeset 4069:cf454aabfc19 framework
improving EmscriptenParameters.cmake
| author | Sebastien Jodogne <s.jodogne@gmail.com> |
|---|---|
| date | Fri, 12 Jun 2020 12:32:34 +0200 |
| parents | 408ac60c3cf8 |
| children | f1e82dd6acb1 |
| files | OrthancFramework/Resources/CMake/EmscriptenParameters.cmake OrthancFramework/SharedLibrary/NOTES.txt |
| diffstat | 2 files changed, 4 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- 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}")
--- 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