Merge remote-tracking branch 'origin/main' into test-suite-failures-s…

…cript
vizzuhq · Jul 30, 2024 · 9a9786f · 9a9786f
2 parents 1623d2c + 55be4e2
commit 9a9786f
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/project/cmake/common.txt b/project/cmake/common.txt
@@ -1,7 +1,7 @@
 set(root ../../..)
 set(sourceDir ${root}/src)
 
-set(CMAKE_CXX_STANDARD 20)
+set(CMAKE_CXX_STANDARD 23)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
 
 if (NOT CMAKE_BUILD_TYPE OR CMAKE_BUILD_TYPE STREQUAL "")

diff --git a/project/cmake/weblib/emcc.txt b/project/cmake/weblib/emcc.txt
@@ -3,7 +3,6 @@ set(CMAKE_CXX_FLAGS  "${CMAKE_CXX_FLAGS} -s DISABLE_EXCEPTION_CATCHING=1")
 set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} \
  -s STRICT=1 \
  -s ASSERTIONS=0 \
- -s SUPPORT_ERRNO=0 \
  -s MODULARIZE=1 \
  -s EXPORT_ES6=1 \
  -s FILESYSTEM=0 \
@@ -61,6 +60,7 @@ set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} \
 'getValue',\
 'addFunction',\
 'removeFunction',\
-'ExceptionInfo'] \
+'ExceptionInfo',\
+'HEAPU8'] \
  -s INCOMING_MODULE_JS_API=['locateFile'] \
 ")
diff --git a/tools/ci/docker/vizzu-dev-wasm b/tools/ci/docker/vizzu-dev-wasm
@@ -17,8 +17,8 @@ RUN apt-get install -y cmake build-essential \
     && cd /root \
     && git clone https://github.com/emscripten-core/emsdk.git \
     && cd /root/emsdk \
-    && ./emsdk install 3.1.51 \
-    && ./emsdk activate 3.1.51 \
+    && ./emsdk install 3.1.64 \
+    && ./emsdk activate 3.1.64 \
     && echo "source \"/root/emsdk/emsdk_env.sh\"" >> /root/.bashrc
 
 # Note: this installs the necessary libs to make the bundled version of Chromium that Puppeteer