mirror/vcpkg
1
0
Fork 0
mirror of https://github.com/microsoft/vcpkg.git synced 2024-12-03 22:39:00 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity
1f2a7c951d
vcpkg/ports/msquic/fix-comparing-system-processor-with-win32.patch

23 lines
1.1 KiB
Diff
Raw Normal View History

[ms-quic] Remove from ci.baseline.txt and fix UWP builds. (#39498) Also fix uwp builds so that all ci.baseline.txt entries can be removed, submitted upstream as https://github.com/microsoft/msquic/pull/4373 Also fix x86-windows builds which incorrectly compared SYSTEM_PROCESSOR with 'win32' rather than 'x86'. Submitted upstream as https://github.com/microsoft/msquic/pull/4374 . This patch originally authored by @LillyWangLL Originally started from https://github.com/microsoft/vcpkg/pull/39475 Co-authored by: Lily Wang <v-lilywang@microsoft.com>
2024-06-26 02:02:38 +08:00
diff --git a/submodules/CMakeLists.txt b/submodules/CMakeLists.txt
index a6c592951..0a0ddf0f8 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")
Reference in New Issue Copy Permalink