Update NAN to 2.22.0 (#2948)

maplibre · Oct 18, 2024 · 8b53102 · 8b53102
1 parent 8c6b368
commit 8b53102
Showing 1 changed file with 7 additions and 1 deletion.
diff --git a/platform/node/CMakeLists.txt b/platform/node/CMakeLists.txt
@@ -6,7 +6,7 @@ include(${CMAKE_CURRENT_LIST_DIR}/cmake/module.cmake)
 add_node_module(
     mbgl-node
     INSTALL_PATH ${PROJECT_SOURCE_DIR}/platform/node/lib/{node_abi}/mbgl.node
-    NAN_VERSION 2.19.0
+    NAN_VERSION 2.22.0
     EXCLUDE_NODE_ABIS
         46
         47
@@ -76,3 +76,9 @@ if(CMAKE_SYSTEM_NAME STREQUAL Linux AND NOT MLN_WITH_SANITIZER)
     add_test(NAME mbgl-node-memory COMMAND npm run test-memory WORKING_DIRECTORY ${PROJECT_SOURCE_DIR})
     add_test(NAME mbgl-node-test COMMAND npm run test WORKING_DIRECTORY ${PROJECT_SOURCE_DIR})
 endif()
+
+# needed because v8config.h uses __cplusplus
+# https://learn.microsoft.com/en-us/cpp/build/reference/zc-cplusplus?view=msvc-170
+if (CMAKE_CXX_COMPILER_ID STREQUAL "MSVC")
+    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /Zc:__cplusplus")
+endif()