Commit 7d77607d authored by Brad King's avatar Brad King Committed by Kitware Robot
Browse files

Merge topic 'vs2019-wow64'

5c50eeaf

 VS: Fix x64 host recognition by x86 cmake process
Acked-by: Kitware Robot's avatarKitware Robot <kwrobot@kitware.com>
Merge-request: !3102
parents 41d796c0 5c50eeaf
......@@ -18,8 +18,15 @@
#elif defined(_M_IA64)
# define HOST_PLATFORM_NAME "Itanium"
# define HOST_TOOLS_ARCH ""
#elif defined(_WIN64)
# define HOST_PLATFORM_NAME "x64"
# define HOST_TOOLS_ARCH "x64"
#else
# include "cmsys/SystemInformation.hxx"
static bool VSIsWow64()
{
BOOL isWow64 = false;
return IsWow64Process(GetCurrentProcess(), &isWow64) && isWow64;
}
#endif
static std::string VSHostPlatformName()
......@@ -27,8 +34,7 @@ static std::string VSHostPlatformName()
#ifdef HOST_PLATFORM_NAME
return HOST_PLATFORM_NAME;
#else
cmsys::SystemInformation info;
if (info.Is64Bits()) {
if (VSIsWow64()) {
return "x64";
} else {
return "Win32";
......@@ -41,8 +47,7 @@ static std::string VSHostArchitecture()
#ifdef HOST_TOOLS_ARCH
return HOST_TOOLS_ARCH;
#else
cmsys::SystemInformation info;
if (info.Is64Bits()) {
if (VSIsWow64()) {
return "x64";
} else {
return "x86";
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment