@@ -65,18 +65,26 @@ endif()
6565
6666# target system on Windows (for cross-compiling x86) and static linking runtimes
6767if (WIN32 )
68- if ("$ENV{Platform} " STREQUAL "x86" )
69- set (CMAKE_SYSTEM_PROCESSOR "x86" )
70- set (VCPKG_TARGET_TRIPLET "x86-windows-static" )
71- elseif (NOT "$ENV{PROCESSOR_ARCHITEW6432} " STREQUAL "" )
72- set (CMAKE_SYSTEM_PROCESSOR "$ENV{PROCESSOR_ARCHITEW6432} " )
73- set (VCPKG_TARGET_TRIPLET "x86-windows-static" )
74- elseif ("$ENV{Platform} " STREQUAL "arm64" )
75- set (CMAKE_SYSTEM_PROCESSOR "arm64" )
68+ if ("${CMAKE_SYSTEM_PROCESSOR} " STREQUAL "" )
69+ if ("$ENV{Platform} " STREQUAL "x86" )
70+ set (CMAKE_SYSTEM_PROCESSOR "x86" )
71+ elseif (NOT "$ENV{PROCESSOR_ARCHITEW6432} " STREQUAL "" )
72+ set (CMAKE_SYSTEM_PROCESSOR "$ENV{PROCESSOR_ARCHITEW6432} " )
73+ else ()
74+ set (CMAKE_SYSTEM_PROCESSOR "$ENV{PROCESSOR_ARCHITECTURE} " )
75+ endif ()
76+ endif ()
77+
78+ string (TOLOWER "${CMAKE_SYSTEM_PROCESSOR} " CMAKE_SYSTEM_PROCESSOR_LOWER)
79+
80+ if ("${CMAKE_SYSTEM_PROCESSOR_LOWER} " STREQUAL "amd64" OR "${CMAKE_SYSTEM_PROCESSOR_LOWER} " STREQUAL "x64" )
81+ set (VCPKG_TARGET_TRIPLET "x64-windows-static" )
82+ elseif ("${CMAKE_SYSTEM_PROCESSOR_LOWER} " STREQUAL "arm64" OR "${CMAKE_SYSTEM_PROCESSOR_LOWER} " STREQUAL "aarch64" )
7683 set (VCPKG_TARGET_TRIPLET "arm64-windows-static" )
84+ elseif ("${CMAKE_SYSTEM_PROCESSOR_LOWER} " STREQUAL "x86" )
85+ set (VCPKG_TARGET_TRIPLET "x86-windows-static" )
7786 else ()
78- set (CMAKE_SYSTEM_PROCESSOR "$ENV{PROCESSOR_ARCHITECTURE} " )
79- set (VCPKG_TARGET_TRIPLET "x64-windows-static" )
87+ message (STATUS "Not setting VCPKG_TARGET_TRIPLET for ${CMAKE_SYSTEM_PROCESSOR} " )
8088 endif ()
8189
8290 # Avoid loading of project_optinos/WindowsToolchain
0 commit comments