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)
49
49
set (CMAKE_OSX_DEPLOYMENT_TARGET ${MACOSX_DEPLOYMENT_TARGET} )
50
50
endif ()
51
51
52
- # Set the target system on Windows (for cross-compiling x86)
52
+ # target system on Windows (for cross-compiling x86) and static linking runtimes
53
53
if (WIN32 )
54
- if ("${PLATFORM } " STREQUAL "x86" )
54
+ if ("$ENV{Platform } " STREQUAL "x86" )
55
55
set (CMAKE_SYSTEM_PROCESSOR "x86" )
56
- set (CMAKE_SYSTEM_HOST_PROCESSOR "x86" )
57
- # static linking for vcpkg
58
56
set (VCPKG_TARGET_TRIPLET "x86-windows-static" )
59
57
elseif (NOT "$ENV{PROCESSOR_ARCHITEW6432} " STREQUAL "" )
60
58
set (CMAKE_SYSTEM_PROCESSOR "$ENV{PROCESSOR_ARCHITEW6432} " )
61
- set (CMAKE_SYSTEM_HOST_PROCESSOR "$ENV{PROCESSOR_ARCHITEW6432} " )
62
- # static linking for vcpkg
63
59
set (VCPKG_TARGET_TRIPLET "x86-windows-static" )
64
60
else ()
65
61
set (CMAKE_SYSTEM_PROCESSOR "$ENV{PROCESSOR_ARCHITECTURE} " )
66
- set (CMAKE_SYSTEM_HOST_PROCESSOR "$ENV{PROCESSOR_ARCHITECTURE} " )
67
- # static linking for vcpkg
68
62
set (VCPKG_TARGET_TRIPLET "x64-windows-static" )
69
63
endif ()
70
64
# Avoid loading of project_optinos/WindowsToolchain
Original file line number Diff line number Diff line change 113
113
"bump" : " pnpx npm-check-updates -u -x typescript,eslint,chai && pnpx typesync && pnpm update"
114
114
},
115
115
"cmake-ts" : {
116
- "globalCMakeOptions" : [
117
- {
118
- "name" : " CMAKE_EXPORT_COMPILE_COMMANDS" ,
119
- "value" : " 1"
120
- }
121
- ],
122
116
"nodeAPI" : " node-addon-api" ,
123
117
"configurations" : [
124
118
{
You can’t perform that action at this time.
0 commit comments