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

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.
This commit is contained in:
Brad King 2011-04-13 10:36:45 -04:00
parent 3ec0119f43
commit 4df119773c
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Source/cmFindPackageCommand.cxx
View File

@ -54,7 +54,7 @@ cmFindPackageCommand::cmFindPackageCommand()
this->CMakePathName = "PACKAGE"; this->CMakePathName = "PACKAGE";
this->Quiet = false; this->Quiet = false;
this->Required = false; this->Required = false;
this->NoRegistry = false; this->NoUserRegistry = false;
this->NoBuilds = false; this->NoBuilds = false;
this->NoModule = false; this->NoModule = false;
this->DebugMode = false; this->DebugMode = false;
@ -444,7 +444,7 @@ bool cmFindPackageCommand
} }
else if(args[i] == "NO_CMAKE_PACKAGE_REGISTRY") else if(args[i] == "NO_CMAKE_PACKAGE_REGISTRY")
{ {
this->NoRegistry = true; this->NoUserRegistry = true;
this->NoModule = true; this->NoModule = true;
this->Compatibility_1_6 = false; this->Compatibility_1_6 = false;
doing = DoingNone; doing = DoingNone;
@ -1181,7 +1181,7 @@ void cmFindPackageCommand::ComputePrefixes()
this->AddPrefixesCMakeEnvironment(); this->AddPrefixesCMakeEnvironment();
this->AddPrefixesUserHints(); this->AddPrefixesUserHints();
this->AddPrefixesSystemEnvironment(); this->AddPrefixesSystemEnvironment();
this->AddPrefixesRegistry(); this->AddPrefixesUserRegistry();
this->AddPrefixesBuilds(); this->AddPrefixesBuilds();
this->AddPrefixesCMakeSystemVariable(); this->AddPrefixesCMakeSystemVariable();
this->AddPrefixesUserGuess(); 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; return;
} }

4
Source/cmFindPackageCommand.h
View File

@ -87,7 +87,7 @@ private:
void AddPrefixesCMakeEnvironment(); void AddPrefixesCMakeEnvironment();
void AddPrefixesCMakeVariable(); void AddPrefixesCMakeVariable();
void AddPrefixesSystemEnvironment(); void AddPrefixesSystemEnvironment();
void AddPrefixesRegistry(); void AddPrefixesUserRegistry();
void AddPrefixesBuilds(); void AddPrefixesBuilds();
void AddPrefixesCMakeSystemVariable(); void AddPrefixesCMakeSystemVariable();
void AddPrefixesUserGuess(); void AddPrefixesUserGuess();
@ -132,7 +132,7 @@ private:
bool Required; bool Required;
bool Compatibility_1_6; bool Compatibility_1_6;
bool NoModule; bool NoModule;
bool NoRegistry; bool NoUserRegistry;
bool NoBuilds; bool NoBuilds;
bool DebugMode; bool DebugMode;
bool UseLib64Paths; bool UseLib64Paths;