build: set CMAKE_HOST_SYSTEM_PROCESSOR for windows + vcpkg deps

Author: aminya

.github/workflows/CI.yml

@@ -52,8 +52,9 @@ jobs:
           - os: ubuntu-22.04
             docker: node:18-alpine
             docker_cmd:
-              apk add --no-cache pkgconfig curl tar python3 make gcc g++ cmake git
-              musl-dev && npm i -g pnpm && pnpm install && pnpm run build
+              apk add --no-cache pkgconfig tar python3 build-base cmake ninja
+              zip unzip curl git musl-dev && npm i -g pnpm && pnpm install &&
+              pnpm run build
             node_version: 18
             node_arch: x64
             cpp_arch: x64
@@ -94,6 +95,7 @@ jobs:
           cmake: true
           ninja: true
           python: true
+          vcpkg: true
           architecture: ${{ matrix.cpp_arch }}
 
       - uses: pnpm/action-setup@v4

CMakeLists.txt

@@ -5,6 +5,14 @@ if(CMAKE_VERSION VERSION_GREATER_EQUAL "3.24.0")
   cmake_policy(SET CMP0135 NEW)
 endif()
 
+if(WIN32)
+  if(DEFINED ENV{PROCESSOR_ARCHITEW6432})
+    set(CMAKE_HOST_SYSTEM_PROCESSOR "$ENV{PROCESSOR_ARCHITEW6432}")
+  else()
+    set(CMAKE_HOST_SYSTEM_PROCESSOR "$ENV{PROCESSOR_ARCHITECTURE}")
+  endif()
+endif()
+
 # Add project_options from https://github.com/aminya/project_options Change the
 # version in the following URL to update the package (watch the releases of the
 # repository for future updates)
@@ -51,7 +59,7 @@ find_package(ZeroMQ CONFIG REQUIRED)
 target_link_system_libraries(addon PRIVATE libzmq libzmq-static)
 
 # Node specific
-target_include_directories(addon PRIVATE ${CMAKE_JS_INC})
+target_include_system_directories(addon PRIVATE ${CMAKE_JS_INC})
 target_link_system_libraries(addon ${CMAKE_JS_LIB})
 
 target_compile_definitions(addon PRIVATE V8_COMPRESS_POINTERS)
@@ -60,12 +68,6 @@ target_compile_definitions(addon PRIVATE V8_REVERSE_JSARGS)
 target_compile_definitions(addon PRIVATE BUILDING_NODE_EXTENSION)
 target_compile_definitions(addon PRIVATE NAPI_CPP_EXCEPTIONS)
 
-# if(WIN32)
-#   target_compile_definitions(addon PRIVATE "NOMINMAX")
-#   target_compile_definitions(addon PRIVATE "NOGDI")
-#   target_compile_definitions(addon PRIVATE "WIN32_LEAN_AND_MEAN")
-# endif()
-
 # Use `.node` for the library without any "lib" prefix
 set_target_properties(addon PROPERTIES PREFIX "" SUFFIX ".node")
 

package.json

@@ -96,7 +96,7 @@
     "deploy.doc": "run-s build.doc && gh-pages --dist \"./docs\"",
     "build.native": "cmake-ts nativeonly",
     "build.native.debug": "cmake-ts nativeonly",
-    "build": "run-s build.js build.native",
+    "build": "run-p build.js build.native",
     "build.debug": "run-s build.js build.native.debug",
     "test": "run-s clean.temp build && mocha",
     "test.skip_gc_tests": "run-s clean.temp build.debug && cross-env SKIP_GC_TESTS=true mocha",