diff options
author | Brad King <brad.king@kitware.com> | 2011-04-13 14:36:45 (GMT) |
---|---|---|
committer | Brad King <brad.king@kitware.com> | 2011-04-13 16:57:18 (GMT) |
commit | 4df119773c18280c0bb16fc87312c8144fc1c3f8 (patch) | |
tree | 348f5a9a426fde5d29021b9efc8b9038770b75c6 | |
parent | 3ec0119f43e2e001f3b96139b76b77b339a29b11 (diff) | |
download | CMake-4df119773c18280c0bb16fc87312c8144fc1c3f8.zip CMake-4df119773c18280c0bb16fc87312c8144fc1c3f8.tar.gz CMake-4df119773c18280c0bb16fc87312c8144fc1c3f8.tar.bz2 |
find_package: Rename implementation of user package registry
Rename {Registry => UserRegistry} in names associated specifically with
the user package registry and not registry access in general.
-rw-r--r-- | Source/cmFindPackageCommand.cxx | 10 | ||||
-rw-r--r-- | Source/cmFindPackageCommand.h | 4 |
2 files changed, 7 insertions, 7 deletions
diff --git a/Source/cmFindPackageCommand.cxx b/Source/cmFindPackageCommand.cxx index d3c4bc7..aaf95fb 100644 --- a/Source/cmFindPackageCommand.cxx +++ b/Source/cmFindPackageCommand.cxx @@ -54,7 +54,7 @@ cmFindPackageCommand::cmFindPackageCommand() this->CMakePathName = "PACKAGE"; this->Quiet = false; this->Required = false; - this->NoRegistry = false; + this->NoUserRegistry = false; this->NoBuilds = false; this->NoModule = false; this->DebugMode = false; @@ -444,7 +444,7 @@ bool cmFindPackageCommand } else if(args[i] == "NO_CMAKE_PACKAGE_REGISTRY") { - this->NoRegistry = true; + this->NoUserRegistry = true; this->NoModule = true; this->Compatibility_1_6 = false; doing = DoingNone; @@ -1181,7 +1181,7 @@ void cmFindPackageCommand::ComputePrefixes() this->AddPrefixesCMakeEnvironment(); this->AddPrefixesUserHints(); this->AddPrefixesSystemEnvironment(); - this->AddPrefixesRegistry(); + this->AddPrefixesUserRegistry(); this->AddPrefixesBuilds(); this->AddPrefixesCMakeSystemVariable(); this->AddPrefixesUserGuess(); @@ -1249,9 +1249,9 @@ void cmFindPackageCommand::AddPrefixesSystemEnvironment() } //---------------------------------------------------------------------------- -void cmFindPackageCommand::AddPrefixesRegistry() +void cmFindPackageCommand::AddPrefixesUserRegistry() { - if(this->NoRegistry || this->NoDefaultPath) + if(this->NoUserRegistry || this->NoDefaultPath) { return; } diff --git a/Source/cmFindPackageCommand.h b/Source/cmFindPackageCommand.h index 19d2b10..a76b25c 100644 --- a/Source/cmFindPackageCommand.h +++ b/Source/cmFindPackageCommand.h @@ -87,7 +87,7 @@ private: void AddPrefixesCMakeEnvironment(); void AddPrefixesCMakeVariable(); void AddPrefixesSystemEnvironment(); - void AddPrefixesRegistry(); + void AddPrefixesUserRegistry(); void AddPrefixesBuilds(); void AddPrefixesCMakeSystemVariable(); void AddPrefixesUserGuess(); @@ -132,7 +132,7 @@ private: bool Required; bool Compatibility_1_6; bool NoModule; - bool NoRegistry; + bool NoUserRegistry; bool NoBuilds; bool DebugMode; bool UseLib64Paths; |