VS: Factor out helper function to compute host platform name

This commit is contained in:
Brad King
2019-01-18 11:41:31 -05:00
parent a61c061b61
commit b70c0aed5c

View File

@@ -19,6 +19,20 @@
# include "cmsys/SystemInformation.hxx"
#endif
static std::string VSHostPlatformName()
{
#ifdef HOST_PLATFORM_NAME
return HOST_PLATFORM_NAME;
#else
cmsys::SystemInformation info;
if (info.Is64Bits()) {
return "x64";
} else {
return "Win32";
}
#endif
}
static unsigned int VSVersionToMajor(
cmGlobalVisualStudioGenerator::VSVersion v)
{
@@ -206,16 +220,7 @@ cmGlobalVisualStudioVersionedGenerator::cmGlobalVisualStudioVersionedGenerator(
this->DefaultCSharpFlagTableName = VSVersionToToolset(this->Version);
this->DefaultLinkFlagTableName = VSVersionToToolset(this->Version);
if (this->Version >= cmGlobalVisualStudioGenerator::VS16) {
#ifdef HOST_PLATFORM_NAME
this->DefaultPlatformName = HOST_PLATFORM_NAME;
#else
cmsys::SystemInformation info;
if (info.Is64Bits()) {
this->DefaultPlatformName = "x64";
} else {
this->DefaultPlatformName = "Win32";
}
#endif
this->DefaultPlatformName = VSHostPlatformName();
}
}