File tree Expand file tree Collapse file tree 2 files changed +2
-14
lines changed Expand file tree Collapse file tree 2 files changed +2
-14
lines changed Original file line number Diff line number Diff line change @@ -49,22 +49,16 @@ if(APPLE)
4949 set (CMAKE_OSX_DEPLOYMENT_TARGET ${MACOSX_DEPLOYMENT_TARGET} )
5050endif ()
5151
52- # Set the target system on Windows (for cross-compiling x86)
52+ # target system on Windows (for cross-compiling x86) and static linking runtimes
5353if (WIN32 )
54- if ("${PLATFORM } " STREQUAL "x86" )
54+ if ("$ENV{Platform } " STREQUAL "x86" )
5555 set (CMAKE_SYSTEM_PROCESSOR "x86" )
56- set (CMAKE_SYSTEM_HOST_PROCESSOR "x86" )
57- # static linking for vcpkg
5856 set (VCPKG_TARGET_TRIPLET "x86-windows-static" )
5957 elseif (NOT "$ENV{PROCESSOR_ARCHITEW6432} " STREQUAL "" )
6058 set (CMAKE_SYSTEM_PROCESSOR "$ENV{PROCESSOR_ARCHITEW6432} " )
61- set (CMAKE_SYSTEM_HOST_PROCESSOR "$ENV{PROCESSOR_ARCHITEW6432} " )
62- # static linking for vcpkg
6359 set (VCPKG_TARGET_TRIPLET "x86-windows-static" )
6460 else ()
6561 set (CMAKE_SYSTEM_PROCESSOR "$ENV{PROCESSOR_ARCHITECTURE} " )
66- set (CMAKE_SYSTEM_HOST_PROCESSOR "$ENV{PROCESSOR_ARCHITECTURE} " )
67- # static linking for vcpkg
6862 set (VCPKG_TARGET_TRIPLET "x64-windows-static" )
6963 endif ()
7064 # Avoid loading of project_optinos/WindowsToolchain
Original file line number Diff line number Diff line change 113113 "bump" : " pnpx npm-check-updates -u -x typescript,eslint,chai && pnpx typesync && pnpm update"
114114 },
115115 "cmake-ts" : {
116- "globalCMakeOptions" : [
117- {
118- "name" : " CMAKE_EXPORT_COMPILE_COMMANDS" ,
119- "value" : " 1"
120- }
121- ],
122116 "nodeAPI" : " node-addon-api" ,
123117 "configurations" : [
124118 {
You can’t perform that action at this time.
0 commit comments