kolan/CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

find_package: Check both 32-bit and 64-bit registry views

Browse Source 
The system package registry is under HKEY_LOCAL_MACHINE\SOFTWARE which
has separate views for 32-bit and 64-bit applications.  Look in both
views, but prefer the architecture matching the build target platform.
This commit is contained in:
Brad King 2011-04-13 13:17:42 -04:00
parent a0d76c10a7
commit b95f3cac91
2 changed files with 40 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
Source/cmFindPackageCommand.cxx
View File

@ -1282,7 +1282,7 @@ void cmFindPackageCommand::AddPrefixesUserRegistry()
} }
#if defined(_WIN32) && !defined(__CYGWIN__) #if defined(_WIN32) && !defined(__CYGWIN__)
this->LoadPackageRegistryWin(true); this->LoadPackageRegistryWinUser();
#elif defined(__HAIKU__) #elif defined(__HAIKU__)
BPath dir; BPath dir;
if (find_directory(B_USER_SETTINGS_DIRECTORY, &dir) == B_OK) if (find_directory(B_USER_SETTINGS_DIRECTORY, &dir) == B_OK)
@ -1311,22 +1311,54 @@ void cmFindPackageCommand::AddPrefixesSystemRegistry()
} }
#if defined(_WIN32) && !defined(__CYGWIN__) #if defined(_WIN32) && !defined(__CYGWIN__)
this->LoadPackageRegistryWin(false); this->LoadPackageRegistryWinSystem();
#endif #endif
} }
#if defined(_WIN32) && !defined(__CYGWIN__) #if defined(_WIN32) && !defined(__CYGWIN__)
# include <windows.h> # include <windows.h>
# undef GetCurrentDirectory # undef GetCurrentDirectory
// http://msdn.microsoft.com/en-us/library/aa384253%28v=vs.85%29.aspx
# if !defined(KEY_WOW64_32KEY)
# define KEY_WOW64_32KEY 0x0200
# endif
# if !defined(KEY_WOW64_64KEY)
# define KEY_WOW64_64KEY 0x0100
# endif
//---------------------------------------------------------------------------- //----------------------------------------------------------------------------
void cmFindPackageCommand::LoadPackageRegistryWin(bool user) void cmFindPackageCommand::LoadPackageRegistryWinUser()
{
// HKEY_CURRENT_USER\\Software shares 32-bit and 64-bit views.
this->LoadPackageRegistryWin(true, 0);
}
//----------------------------------------------------------------------------
void cmFindPackageCommand::LoadPackageRegistryWinSystem()
{
// HKEY_LOCAL_MACHINE\\SOFTWARE has separate 32-bit and 64-bit views.
// Prefer the target platform view first.
if(this->Makefile->PlatformIs64Bit())
{
this->LoadPackageRegistryWin(false, KEY_WOW64_64KEY);
this->LoadPackageRegistryWin(false, KEY_WOW64_32KEY);
}
else
{
this->LoadPackageRegistryWin(false, KEY_WOW64_32KEY);
this->LoadPackageRegistryWin(false, KEY_WOW64_64KEY);
}
}
//----------------------------------------------------------------------------
void cmFindPackageCommand::LoadPackageRegistryWin(bool user,
unsigned int view)
{ {
std::string key = "Software\\Kitware\\CMake\\Packages\\"; std::string key = "Software\\Kitware\\CMake\\Packages\\";
key += this->Name; key += this->Name;
std::set<cmStdString> bad; std::set<cmStdString> bad;
HKEY hKey; HKEY hKey;
if(RegOpenKeyEx(user? HKEY_CURRENT_USER : HKEY_LOCAL_MACHINE, key.c_str(), if(RegOpenKeyEx(user? HKEY_CURRENT_USER : HKEY_LOCAL_MACHINE, key.c_str(),
0, KEY_QUERY_VALUE, &hKey) == ERROR_SUCCESS) 0, KEY_QUERY_VALUE|view, &hKey) == ERROR_SUCCESS)
{ {
DWORD valueType = REG_NONE; DWORD valueType = REG_NONE;
char name[16384]; char name[16384];
@ -1365,7 +1397,7 @@ void cmFindPackageCommand::LoadPackageRegistryWin(bool user)
// Remove bad values if possible. // Remove bad values if possible.
if(user && !bad.empty() && if(user && !bad.empty() &&
RegOpenKeyEx(HKEY_CURRENT_USER, key.c_str(), RegOpenKeyEx(HKEY_CURRENT_USER, key.c_str(),
0, KEY_SET_VALUE, &hKey) == ERROR_SUCCESS) 0, KEY_SET_VALUE|view, &hKey) == ERROR_SUCCESS)
{ {
for(std::set<cmStdString>::const_iterator vi = bad.begin(); for(std::set<cmStdString>::const_iterator vi = bad.begin();
vi != bad.end(); ++vi) vi != bad.end(); ++vi)

4
Source/cmFindPackageCommand.h
View File

@ -95,7 +95,9 @@ private:
void AddPrefixesUserHints(); void AddPrefixesUserHints();
void ComputeFinalPrefixes(); void ComputeFinalPrefixes();
void LoadPackageRegistryDir(std::string const& dir); void LoadPackageRegistryDir(std::string const& dir);
void LoadPackageRegistryWin(bool user); void LoadPackageRegistryWinUser();
void LoadPackageRegistryWinSystem();
void LoadPackageRegistryWin(bool user, unsigned int view);
bool CheckPackageRegistryEntry(std::istream& is); bool CheckPackageRegistryEntry(std::istream& is);
bool SearchDirectory(std::string const& dir); bool SearchDirectory(std::string const& dir);
bool CheckDirectory(std::string const& dir); bool CheckDirectory(std::string const& dir);