Skip to content

Commit 23dce78

Browse files
committed
test: pass the vcpkg triplet as lower
1 parent 9453b51 commit 23dce78

File tree

1 file changed

+16
-12
lines changed

1 file changed

+16
-12
lines changed

test/patches/zeromq+6.4.1.patch

Lines changed: 16 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,16 @@
11
diff --git a/node_modules/zeromq/CMakeLists.txt b/node_modules/zeromq/CMakeLists.txt
2-
index 3ace20f..84ceca9 100644
2+
index 3ace20f..e995112 100644
33
--- a/node_modules/zeromq/CMakeLists.txt
44
+++ b/node_modules/zeromq/CMakeLists.txt
5-
@@ -65,17 +65,18 @@ endif()
6-
5+
@@ -65,15 +65,24 @@ endif()
6+
77
# target system on Windows (for cross-compiling x86) and static linking runtimes
88
if(WIN32)
99
- if("$ENV{Platform}" STREQUAL "x86")
1010
- set(CMAKE_SYSTEM_PROCESSOR "x86")
1111
- set(VCPKG_TARGET_TRIPLET "x86-windows-static")
1212
- elseif(NOT "$ENV{PROCESSOR_ARCHITEW6432}" STREQUAL "")
1313
- set(CMAKE_SYSTEM_PROCESSOR "$ENV{PROCESSOR_ARCHITEW6432}")
14-
- set(VCPKG_TARGET_TRIPLET "x86-windows-static")
15-
- else()
16-
- set(CMAKE_SYSTEM_PROCESSOR "$ENV{PROCESSOR_ARCHITECTURE}")
17-
- set(VCPKG_TARGET_TRIPLET "x64-windows-static")
1814
+ if("${CMAKE_SYSTEM_PROCESSOR}" STREQUAL "")
1915
+ if("$ENV{Platform}" STREQUAL "x86")
2016
+ set(CMAKE_SYSTEM_PROCESSOR "x86")
@@ -23,13 +19,21 @@ index 3ace20f..84ceca9 100644
2319
+ else()
2420
+ set(CMAKE_SYSTEM_PROCESSOR "$ENV{PROCESSOR_ARCHITECTURE}")
2521
+ endif()
26-
endif()
27-
28-
+ set(VCPKG_TARGET_TRIPLET "${CMAKE_SYSTEM_PROCESSOR}-windows-static")
22+
+ endif()
2923
+
24+
+ if("${CMAKE_SYSTEM_PROCESSOR}" STREQUAL "AMD64")
25+
+ set(VCPKG_TARGET_TRIPLET "x64-windows-static")
26+
+ elseif("${CMAKE_SYSTEM_PROCESSOR}" STREQUAL "ARM64")
27+
+ set(VCPKG_TARGET_TRIPLET "arm64-windows-static")
28+
+ elseif("${CMAKE_SYSTEM_PROCESSOR}" STREQUAL "X86")
29+
set(VCPKG_TARGET_TRIPLET "x86-windows-static")
30+
else()
31+
- set(CMAKE_SYSTEM_PROCESSOR "$ENV{PROCESSOR_ARCHITECTURE}")
32+
- set(VCPKG_TARGET_TRIPLET "x64-windows-static")
33+
+ message(STATUS "Not setting VCPKG_TARGET_TRIPLET for ${CMAKE_SYSTEM_PROCESSOR}")
34+
endif()
35+
3036
# Avoid loading of project_optinos/WindowsToolchain
31-
set(CMAKE_TOOLCHAIN_FILE ";")
32-
3337
diff --git a/node_modules/zeromq/src/module.h b/node_modules/zeromq/src/module.h
3438
index b28d789..79d190e 100644
3539
--- a/node_modules/zeromq/src/module.h

0 commit comments

Comments
 (0)