From 14ab90a1f9686c3d1f91501fa076ec683bbd16c8 Mon Sep 17 00:00:00 2001 From: Billy Robert O'Neal III Date: Mon, 24 Jun 2024 14:07:38 -0700 Subject: [PATCH 1/2] Fix comparing SYSTEM_PROCESSOR with win32. This is going to be a processor type like x86, x64, arm, or arm64. This change was originally authored by @LilyWangLL in https://github.com/microsoft/vcpkg/pull/39475 --- submodules/CMakeLists.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/submodules/CMakeLists.txt b/submodules/CMakeLists.txt index a6c5929512..0a0ddf0f83 100644 --- a/submodules/CMakeLists.txt +++ b/submodules/CMakeLists.txt @@ -62,7 +62,7 @@ if (WIN32) set(QUIC_OPENSSL_WIN_ARCH "VC-WIN64-ARM") elseif (${SYSTEM_PROCESSOR} STREQUAL "arm") set(QUIC_OPENSSL_WIN_ARCH "VC-WIN32-ARM") - elseif (${SYSTEM_PROCESSOR} STREQUAL "win32") + elseif (${SYSTEM_PROCESSOR} STREQUAL "x86") set(QUIC_OPENSSL_WIN_ARCH "VC-WIN32-ONECORE") elseif (${SYSTEM_PROCESSOR} STREQUAL "x64" OR ${SYSTEM_PROCESSOR} STREQUAL "amd64") set(QUIC_OPENSSL_WIN_ARCH "VC-WIN64A-ONECORE") @@ -75,7 +75,7 @@ if (WIN32) set(QUIC_OPENSSL_WIN_ARCH "VC-WIN64-ARM") elseif (${SYSTEM_PROCESSOR} STREQUAL "arm") set(QUIC_OPENSSL_WIN_ARCH "VC-WIN32-ARM") - elseif (${SYSTEM_PROCESSOR} STREQUAL "win32") + elseif (${SYSTEM_PROCESSOR} STREQUAL "x86") set(QUIC_OPENSSL_WIN_ARCH "VC-WIN32") elseif (${SYSTEM_PROCESSOR} STREQUAL "x64" OR ${SYSTEM_PROCESSOR} STREQUAL "amd64") set(QUIC_OPENSSL_WIN_ARCH "VC-WIN64A") From d7cbf60b7729a1481b406bd3983796f8d9498896 Mon Sep 17 00:00:00 2001 From: Nick Banks Date: Thu, 9 Jan 2025 07:23:59 -0500 Subject: [PATCH 2/2] Compare both Co-authored-by: Kai Pastor --- submodules/CMakeLists.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/submodules/CMakeLists.txt b/submodules/CMakeLists.txt index 0a0ddf0f83..a1f79f8b32 100644 --- a/submodules/CMakeLists.txt +++ b/submodules/CMakeLists.txt @@ -62,7 +62,7 @@ if (WIN32) set(QUIC_OPENSSL_WIN_ARCH "VC-WIN64-ARM") elseif (${SYSTEM_PROCESSOR} STREQUAL "arm") set(QUIC_OPENSSL_WIN_ARCH "VC-WIN32-ARM") - elseif (${SYSTEM_PROCESSOR} STREQUAL "x86") + elseif (${SYSTEM_PROCESSOR} STREQUAL "win32" OR ${SYSTEM_PROCESSOR} STREQUAL "x86") set(QUIC_OPENSSL_WIN_ARCH "VC-WIN32-ONECORE") elseif (${SYSTEM_PROCESSOR} STREQUAL "x64" OR ${SYSTEM_PROCESSOR} STREQUAL "amd64") set(QUIC_OPENSSL_WIN_ARCH "VC-WIN64A-ONECORE") @@ -75,7 +75,7 @@ if (WIN32) set(QUIC_OPENSSL_WIN_ARCH "VC-WIN64-ARM") elseif (${SYSTEM_PROCESSOR} STREQUAL "arm") set(QUIC_OPENSSL_WIN_ARCH "VC-WIN32-ARM") - elseif (${SYSTEM_PROCESSOR} STREQUAL "x86") + elseif (${SYSTEM_PROCESSOR} STREQUAL "win32" OR ${SYSTEM_PROCESSOR} STREQUAL "x86") set(QUIC_OPENSSL_WIN_ARCH "VC-WIN32") elseif (${SYSTEM_PROCESSOR} STREQUAL "x64" OR ${SYSTEM_PROCESSOR} STREQUAL "amd64") set(QUIC_OPENSSL_WIN_ARCH "VC-WIN64A")