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)
commite052bb64ef35b0200b772df7c73cd4dfb7a2358b (patch)
treee8e8201c90fef387598d42cd8d844750b074c968
parentb0db63db097cf729ac0aaf97b4c0e2742f1b0b36 (diff)
parentda0f74b5a1f120157d401b1430b36550a924db34 (diff)
downloadCMake-e052bb64ef35b0200b772df7c73cd4dfb7a2358b.zip
CMake-e052bb64ef35b0200b772df7c73cd4dfb7a2358b.tar.gz
CMake-e052bb64ef35b0200b772df7c73cd4dfb7a2358b.tar.bz2
Merge topic 'vs-ARM64EC'
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;
}