summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPatrick Gansterer <paroga@paroga.com>2013-08-04 16:27:07 (GMT)
committerPatrick Gansterer <paroga@paroga.com>2013-08-05 11:38:30 (GMT)
commit3873d29d9e2243baf843ebcc9b8dafbe51cb6ae9 (patch)
treeeff18b357f6a7dce6b24f7f9d5f32c965f5ab918
parent40a4302414e7dc51525f0b14159f0bebb45c9614 (diff)
downloadCMake-3873d29d9e2243baf843ebcc9b8dafbe51cb6ae9.zip
CMake-3873d29d9e2243baf843ebcc9b8dafbe51cb6ae9.tar.gz
CMake-3873d29d9e2243baf843ebcc9b8dafbe51cb6ae9.tar.bz2
Fix detection of WinCE SDKs with 64bit verion of CMake
Use cmSystemTools::KeyWOW64_32 instead of KeyWOW64_Default to make sure that the correct part of the registry is read.
-rw-r--r--Source/cmVisualStudioWCEPlatformParser.cxx8
1 files changed, 6 insertions, 2 deletions
diff --git a/Source/cmVisualStudioWCEPlatformParser.cxx b/Source/cmVisualStudioWCEPlatformParser.cxx
index b302246..219a5eb 100644
--- a/Source/cmVisualStudioWCEPlatformParser.cxx
+++ b/Source/cmVisualStudioWCEPlatformParser.cxx
@@ -20,8 +20,12 @@ int cmVisualStudioWCEPlatformParser::ParseVersion(const char* version)
const std::string vckey = registryBase + "\\Setup\\VC;ProductDir";
const std::string vskey = registryBase + "\\Setup\\VS;ProductDir";
- if(!cmSystemTools::ReadRegistryValue(vckey.c_str(), this->VcInstallDir) ||
- !cmSystemTools::ReadRegistryValue(vskey.c_str(), this->VsInstallDir))
+ if(!cmSystemTools::ReadRegistryValue(vckey.c_str(),
+ this->VcInstallDir,
+ cmSystemTools::KeyWOW64_32) ||
+ !cmSystemTools::ReadRegistryValue(vskey.c_str(),
+ this->VsInstallDir,
+ cmSystemTools::KeyWOW64_32))
{
return 0;
}