summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2021-06-30 11:30:19 (GMT)
committerKitware Robot <kwrobot@kitware.com>2021-06-30 11:30:24 (GMT)
commit2e7ce62b73b871b2f01a24366b5e2952536aa6f0 (patch)
tree48a5e11686948126c40a724fdc1084f9f8726077
parente28c2ee9aeddad47f356cbd9f9e64eec3dd1bb25 (diff)
parentda0f74b5a1f120157d401b1430b36550a924db34 (diff)
downloadCMake-2e7ce62b73b871b2f01a24366b5e2952536aa6f0.zip
CMake-2e7ce62b73b871b2f01a24366b5e2952536aa6f0.tar.gz
CMake-2e7ce62b73b871b2f01a24366b5e2952536aa6f0.tar.bz2
Merge topic 'vs-ARM64EC' into release-3.21
da0f74b5a1 VS: Add ARM64EC to supported platforms for VS 16 and 17 Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6283
-rw-r--r--Source/cmGlobalVisualStudioVersionedGenerator.cxx3
1 files changed, 2 insertions, 1 deletions
diff --git a/Source/cmGlobalVisualStudioVersionedGenerator.cxx b/Source/cmGlobalVisualStudioVersionedGenerator.cxx
index aafc9d5..4fab0b9 100644
--- a/Source/cmGlobalVisualStudioVersionedGenerator.cxx
+++ b/Source/cmGlobalVisualStudioVersionedGenerator.cxx
@@ -211,7 +211,6 @@ public:
platforms.emplace_back("Win32");
platforms.emplace_back("ARM");
platforms.emplace_back("ARM64");
- platforms.emplace_back("ARM64EC");
return platforms;
}
@@ -305,6 +304,7 @@ public:
platforms.emplace_back("Win32");
platforms.emplace_back("ARM");
platforms.emplace_back("ARM64");
+ platforms.emplace_back("ARM64EC");
return platforms;
}
@@ -369,6 +369,7 @@ public:
platforms.emplace_back("Win32");
platforms.emplace_back("ARM");
platforms.emplace_back("ARM64");
+ platforms.emplace_back("ARM64EC");
return platforms;
}