diff options
author | Brad King <brad.king@kitware.com> | 2011-04-13 17:14:41 (GMT) |
---|---|---|
committer | Brad King <brad.king@kitware.com> | 2011-04-13 17:17:00 (GMT) |
commit | a0d76c10a72fb1cdb551f729bd8c74493543a6c7 (patch) | |
tree | 272c985b5e322e4c342bb51f22df3404f4a4d068 /Source/cmFindPackageCommand.h | |
parent | 549458f280b19189e78f3d9dcae2be22854b1178 (diff) | |
download | CMake-a0d76c10a72fb1cdb551f729bd8c74493543a6c7.zip CMake-a0d76c10a72fb1cdb551f729bd8c74493543a6c7.tar.gz CMake-a0d76c10a72fb1cdb551f729bd8c74493543a6c7.tar.bz2 |
find_package: Search a "system package registry"
Generalize the "user package registry" created by commit ed0650f6 (Teach
find_package to search a "package registry", 2009-09-01). Define a
corresponding "system" registry key under HKEY_LOCAL_MACHINE. This
gives package installers a place to create a registry value that points
at the right location for find_package() to locate the package.
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 a76b25c..fa3fd4f 100644 --- a/Source/cmFindPackageCommand.h +++ b/Source/cmFindPackageCommand.h @@ -88,13 +88,14 @@ private: void AddPrefixesCMakeVariable(); void AddPrefixesSystemEnvironment(); void AddPrefixesUserRegistry(); + void AddPrefixesSystemRegistry(); void AddPrefixesBuilds(); void AddPrefixesCMakeSystemVariable(); void AddPrefixesUserGuess(); void AddPrefixesUserHints(); void ComputeFinalPrefixes(); void LoadPackageRegistryDir(std::string const& dir); - void LoadPackageRegistryWin(); + void LoadPackageRegistryWin(bool user); bool CheckPackageRegistryEntry(std::istream& is); bool SearchDirectory(std::string const& dir); bool CheckDirectory(std::string const& dir); @@ -133,6 +134,7 @@ private: bool Compatibility_1_6; bool NoModule; bool NoUserRegistry; + bool NoSystemRegistry; bool NoBuilds; bool DebugMode; bool UseLib64Paths; |