Skip to content

Commit ccd8bc5

Browse files
committed
Merge remote-tracking branch 'origin/main' into fix_areachart_zerostart_marker_tooltip
2 parents 83c7070 + 55be4e2 commit ccd8bc5

File tree

3 files changed

+5
-5
lines changed

3 files changed

+5
-5
lines changed

project/cmake/common.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
set(root ../../..)
22
set(sourceDir ${root}/src)
33

4-
set(CMAKE_CXX_STANDARD 20)
4+
set(CMAKE_CXX_STANDARD 23)
55
set(CMAKE_CXX_STANDARD_REQUIRED ON)
66

77
if (NOT CMAKE_BUILD_TYPE OR CMAKE_BUILD_TYPE STREQUAL "")

project/cmake/weblib/emcc.txt

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -s DISABLE_EXCEPTION_CATCHING=1")
33
set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} \
44
-s STRICT=1 \
55
-s ASSERTIONS=0 \
6-
-s SUPPORT_ERRNO=0 \
76
-s MODULARIZE=1 \
87
-s EXPORT_ES6=1 \
98
-s FILESYSTEM=0 \
@@ -61,6 +60,7 @@ set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} \
6160
'getValue',\
6261
'addFunction',\
6362
'removeFunction',\
64-
'ExceptionInfo'] \
63+
'ExceptionInfo',\
64+
'HEAPU8'] \
6565
-s INCOMING_MODULE_JS_API=['locateFile'] \
6666
")

tools/ci/docker/vizzu-dev-wasm

+2-2
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@ RUN apt-get install -y cmake build-essential \
1717
&& cd /root \
1818
&& git clone https://github.com/emscripten-core/emsdk.git \
1919
&& cd /root/emsdk \
20-
&& ./emsdk install 3.1.51 \
21-
&& ./emsdk activate 3.1.51 \
20+
&& ./emsdk install 3.1.64 \
21+
&& ./emsdk activate 3.1.64 \
2222
&& echo "source \"/root/emsdk/emsdk_env.sh\"" >> /root/.bashrc
2323

2424
# Note: this installs the necessary libs to make the bundled version of Chromium that Puppeteer

0 commit comments

Comments
 (0)