Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[platform-expression] add arm32 platform identifier #196

Merged
merged 2 commits into from
Sep 17, 2021
Merged

[platform-expression] add arm32 platform identifier #196

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8733ec8
add arm32 platform identifier
strega-nil Sep 14, 2021
bb1084e
Add tests
strega-nil Sep 14, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions src/vcpkg/platform-expression.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ namespace vcpkg::PlatformExpression
x86,
x64,
arm,
arm32,
arm64,
wasm32,

Expand All @@ -43,6 +44,7 @@ namespace vcpkg::PlatformExpression
{"x86", Identifier::x86},
{"x64", Identifier::x64},
{"arm", Identifier::arm},
{"arm32", Identifier::arm32},
{"arm64", Identifier::arm64},
{"wasm32", Identifier::wasm32},
{"windows", Identifier::windows},
Expand Down Expand Up @@ -386,6 +388,7 @@ namespace vcpkg::PlatformExpression
// This is because it previously was only checking for a substring.
return true_if_exists_and_equal("VCPKG_TARGET_ARCHITECTURE", "arm") ||
true_if_exists_and_equal("VCPKG_TARGET_ARCHITECTURE", "arm64");
case Identifier::arm32: return true_if_exists_and_equal("VCPKG_TARGET_ARCHITECTURE", "arm");
case Identifier::arm64: return true_if_exists_and_equal("VCPKG_TARGET_ARCHITECTURE", "arm64");
case Identifier::windows:
return true_if_exists_and_equal("VCPKG_CMAKE_SYSTEM_NAME", "") ||
Expand Down