diff options
| author | Brad King <brad.king@kitware.com> | 2011-04-13 17:17:42 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2011-04-13 17:17:42 (GMT) |
| commit | b95f3cac91488f754bfef183e391c1dae03ba406 (patch) | |
| tree | f21e5390763220386de0493f3157cb9221296be9 /Source/cmFindPackageCommand.h | |
| parent | a0d76c10a72fb1cdb551f729bd8c74493543a6c7 (diff) | |
| download | CMake-b95f3cac91488f754bfef183e391c1dae03ba406.zip CMake-b95f3cac91488f754bfef183e391c1dae03ba406.tar.gz CMake-b95f3cac91488f754bfef183e391c1dae03ba406.tar.bz2 | |
find_package: Check both 32-bit and 64-bit registry views
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.
Diffstat (limited to 'Source/cmFindPackageCommand.h')
| -rw-r--r-- | Source/cmFindPackageCommand.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/Source/cmFindPackageCommand.h b/Source/cmFindPackageCommand.h index fa3fd4f..4229d37 100644 --- a/Source/cmFindPackageCommand.h +++ b/Source/cmFindPackageCommand.h @@ -95,7 +95,9 @@ private: void AddPrefixesUserHints(); void ComputeFinalPrefixes(); 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 SearchDirectory(std::string const& dir); bool CheckDirectory(std::string const& dir); |