mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-01-07 06:09:52 -06:00
Code Issues Packages Projects Releases Wiki Activity

VS: ARM64 as default toolset architecture for ARM64 host

Browse Source 
Visual Studio 2022 17 Preview introduced a native ARM64 toolchain.
This commit is contained in:
Niyas Sait
2022-05-15 18:15:21 +01:00
committed by Brad King
parent dc3d0b5a0a
commit af6928ce92
4 changed files with 22 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Help/variable/CMAKE_VS_PLATFORM_TOOLSET_HOST_ARCHITECTURE.rst
View File

@@ -9,4 +9,4 @@ The :ref:`Visual Studio Generators` for VS 2013 and above support using
either the 32-bit or 64-bit host toolchains by specifying a ``host=x86`` either the 32-bit or 64-bit host toolchains by specifying a ``host=x86``
or ``host=x64`` value in the :variable:`CMAKE_GENERATOR_TOOLSET` option. or ``host=x64`` value in the :variable:`CMAKE_GENERATOR_TOOLSET` option.
CMake provides the selected toolchain architecture preference in this CMake provides the selected toolchain architecture preference in this
variable (``x86``, ``x64``, or empty). variable (``x86``, ``x64``, ``ARM64`` or empty).

3
Source/cmGlobalVisualStudio12Generator.cxx
View File

@@ -138,7 +138,8 @@ bool cmGlobalVisualStudio12Generator::MatchesGeneratorName(
bool cmGlobalVisualStudio12Generator::ProcessGeneratorToolsetField( bool cmGlobalVisualStudio12Generator::ProcessGeneratorToolsetField(
std::string const& key, std::string const& value) std::string const& key, std::string const& value)
{ {
if (key == "host" && (value == "x64" || value == "x86")) { if (key == "host" &&
(value == "x64" || value == "x86" || value == "ARM64")) {
this->GeneratorToolsetHostArchitecture = value; this->GeneratorToolsetHostArchitecture = value;
return true; return true;
} }

18
Source/cmGlobalVisualStudioVersionedGenerator.cxx
View File

@@ -27,16 +27,17 @@
#if defined(_M_ARM64) #if defined(_M_ARM64)
# define HOST_PLATFORM_NAME "ARM64" # define HOST_PLATFORM_NAME "ARM64"
# define HOST_TOOLS_ARCH "" # define HOST_TOOLS_ARCH(v) \
(v >= cmGlobalVisualStudioGenerator::VSVersion::VS17) ? "ARM64" : ""
#elif defined(_M_ARM) #elif defined(_M_ARM)
# define HOST_PLATFORM_NAME "ARM" # define HOST_PLATFORM_NAME "ARM"
# define HOST_TOOLS_ARCH "" # define HOST_TOOLS_ARCH(v) ""
#elif defined(_M_IA64) #elif defined(_M_IA64)
# define HOST_PLATFORM_NAME "Itanium" # define HOST_PLATFORM_NAME "Itanium"
# define HOST_TOOLS_ARCH "" # define HOST_TOOLS_ARCH(v) ""
#elif defined(_WIN64) #elif defined(_WIN64)
# define HOST_PLATFORM_NAME "x64" # define HOST_PLATFORM_NAME "x64"
# define HOST_TOOLS_ARCH "x64" # define HOST_TOOLS_ARCH(v) "x64"
#else #else
static bool VSIsWow64() static bool VSIsWow64()
{ {
@@ -58,10 +59,12 @@ static std::string VSHostPlatformName()
#endif #endif
} }
static std::string VSHostArchitecture() static std::string VSHostArchitecture(
cmGlobalVisualStudioGenerator::VSVersion v)
{ {
static_cast<void>(v);
#ifdef HOST_TOOLS_ARCH #ifdef HOST_TOOLS_ARCH
return HOST_TOOLS_ARCH; return HOST_TOOLS_ARCH(v);
#else #else
if (VSIsWow64()) { if (VSIsWow64()) {
return "x64"; return "x64";
@@ -433,7 +436,8 @@ cmGlobalVisualStudioVersionedGenerator::cmGlobalVisualStudioVersionedGenerator(
this->DefaultLinkFlagTableName = VSVersionToToolset(this->Version); this->DefaultLinkFlagTableName = VSVersionToToolset(this->Version);
if (this->Version >= cmGlobalVisualStudioGenerator::VSVersion::VS16) { if (this->Version >= cmGlobalVisualStudioGenerator::VSVersion::VS16) {
this->DefaultPlatformName = VSHostPlatformName(); this->DefaultPlatformName = VSHostPlatformName();
this->DefaultPlatformToolsetHostArchitecture = VSHostArchitecture(); this->DefaultPlatformToolsetHostArchitecture =
VSHostArchitecture(this->Version);
} }
if (this->Version >= cmGlobalVisualStudioGenerator::VSVersion::VS17) { if (this->Version >= cmGlobalVisualStudioGenerator::VSVersion::VS17) {
// FIXME: Search for an existing framework? Under '%ProgramFiles(x86)%', // FIXME: Search for an existing framework? Under '%ProgramFiles(x86)%',

10
Tests/RunCMake/GeneratorToolset/TestToolsetHostArchNone.cmake
View File

@@ -6,8 +6,14 @@ if(CMAKE_GENERATOR MATCHES "Visual Studio 1[67]")
cmake_host_system_information(RESULT is_64_bit QUERY IS_64BIT) cmake_host_system_information(RESULT is_64_bit QUERY IS_64BIT)
if(is_64_bit) if(is_64_bit)
if("${CMAKE_HOST_SYSTEM_PROCESSOR}" STREQUAL "ARM64") if("${CMAKE_HOST_SYSTEM_PROCESSOR}" STREQUAL "ARM64")
if(NOT "${CMAKE_VS_PLATFORM_TOOLSET_HOST_ARCHITECTURE}" STREQUAL "") if(CMAKE_GENERATOR STREQUAL "Visual Studio 17 2022")
message(FATAL_ERROR "CMAKE_VS_PLATFORM_TOOLSET_HOST_ARCHITECTURE is not empty as expected.") if(NOT "${CMAKE_VS_PLATFORM_TOOLSET_HOST_ARCHITECTURE}" STREQUAL "ARM64")
message(FATAL_ERROR "CMAKE_VS_PLATFORM_TOOLSET_HOST_ARCHITECTURE is not 'ARM64' as expected.")
endif()
else()
if(NOT "${CMAKE_VS_PLATFORM_TOOLSET_HOST_ARCHITECTURE}" STREQUAL "")
message(FATAL_ERROR "CMAKE_VS_PLATFORM_TOOLSET_HOST_ARCHITECTURE is not empty as expected.")
endif()
endif() endif()
elseif(NOT "${CMAKE_VS_PLATFORM_TOOLSET_HOST_ARCHITECTURE}" STREQUAL "x64") elseif(NOT "${CMAKE_VS_PLATFORM_TOOLSET_HOST_ARCHITECTURE}" STREQUAL "x64")
message(FATAL_ERROR "CMAKE_VS_PLATFORM_TOOLSET_HOST_ARCHITECTURE is not 'x64' as expected.") message(FATAL_ERROR "CMAKE_VS_PLATFORM_TOOLSET_HOST_ARCHITECTURE is not 'x64' as expected.")