github/CoolProp
1
1
Fork 0
mirror of https://github.com/CoolProp/CoolProp.git synced 2026-04-23 03:00:17 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix javascript building (I think) in GH Actions

Browse Source 
See #2394
This commit is contained in:
Ian Bell
2024-07-06 18:47:47 -04:00
parent 4a6c169894
commit 8eed9591eb
2 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
.github/workflows/javascript_builder.yml vendored
View File

@@ -26,7 +26,8 @@ jobs:
- name: Configure CMake
shell: bash
run: |
cmake -B build -S . -DCMAKE_TOOLCHAIN_FILE=/emsdk/upstream/emscripten/cmake/Modules/Platform/Emscripten.cmake -DCOOLPROP_JAVASCRIPT_MODULE:BOOL=ON -DEMSCRIPTEN_INIT_FLAG:BOOL=OFF -DCMAKE_BUILD_TYPE=$BUILD_TYPE
cmake -B build -S . -DCMAKE_TOOLCHAIN_FILE=/emsdk/upstream/emscripten/cmake/Modules/Platform/Emscripten.cmake -DCOOLPROP_JAVASCRIPT_MODULE:BOOL=ON -DCMAKE_BUILD_TYPE=$BUILD_TYPE
# cmake -B build -S . -DCMAKE_TOOLCHAIN_FILE=/emsdk/upstream/emscripten/cmake/Modules/Platform/Emscripten.cmake -DCOOLPROP_JAVASCRIPT_MODULE:BOOL=ON -DEMSCRIPTEN_INIT_FLAG:BOOL=OFF -DCMAKE_BUILD_TYPE=$BUILD_TYPE
# cmake -B build -S . -DCMAKE_TOOLCHAIN_FILE=/emsdk/upstream/emscripten/cmake/Modules/Platform/Emscripten.cmake -DCOOLPROP_JAVASCRIPT_MODULE:BOOL=ON -DEMSCRIPTEN_INIT_FLAG:BOOL=ON -DCMAKE_BUILD_TYPE=RelWithDebInfo
- name: Build

12
CMakeLists.txt
View File

@@ -1796,12 +1796,12 @@ if(COOLPROP_JAVASCRIPT_MODULE)
endif()
add_definitions(-sDISABLE_EXCEPTION_CATCHING=0)
# If you want a monolithic file with no async memory loading, define EMSCRIPTEN_NO_MEMORY_INIT_FILE
if(EMSCRIPTEN_NO_MEMORY_INIT_FILE)
set(EMSCRIPTEN_INIT_FLAG "--memory-init-file 0")
else()
set(EMSCRIPTEN_INIT_FLAG "--memory-init-file 1")
endif()
# # If you want a monolithic file with no async memory loading, define EMSCRIPTEN_NO_MEMORY_INIT_FILE
# if(EMSCRIPTEN_NO_MEMORY_INIT_FILE)
# set(EMSCRIPTEN_INIT_FLAG "--memory-init-file 0")
# else()
# set(EMSCRIPTEN_INIT_FLAG "--memory-init-file 1")
# endif()
set(CMAKE_EXE_LINKER_FLAGS
"--bind ${EMSCRIPTEN_INIT_FLAG} -s ASSERTIONS=1 -s DISABLE_EXCEPTION_CATCHING=0"