summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlex Neundorf <neundorf@kde.org>2012-02-17 20:31:08 (GMT)
committerBrad King <brad.king@kitware.com>2012-02-27 21:36:29 (GMT)
commit978d89b99db233f2fbe5a9cfa4c7acdca93e6442 (patch)
tree66d57021562b61b277c6f5351c378755321affab
parentb3f9fe42f949515dfdb2635bc0031c5b1b807dc0 (diff)
downloadCMake-978d89b99db233f2fbe5a9cfa4c7acdca93e6442.zip
CMake-978d89b99db233f2fbe5a9cfa4c7acdca93e6442.tar.gz
CMake-978d89b99db233f2fbe5a9cfa4c7acdca93e6442.tar.bz2
find_package: rename NoModule to UseFindModules
...positive logic is easier to handle Alex
-rw-r--r--Source/cmFindPackageCommand.cxx28
-rw-r--r--Source/cmFindPackageCommand.h2
2 files changed, 15 insertions, 15 deletions
diff --git a/Source/cmFindPackageCommand.cxx b/Source/cmFindPackageCommand.cxx
index b0a7607..5254de8 100644
--- a/Source/cmFindPackageCommand.cxx
+++ b/Source/cmFindPackageCommand.cxx
@@ -57,7 +57,7 @@ cmFindPackageCommand::cmFindPackageCommand()
this->NoUserRegistry = false;
this->NoSystemRegistry = false;
this->NoBuilds = false;
- this->NoModule = false;
+ this->UseFindModules = true;
this->DebugMode = false;
this->UseLib64Paths = false;
this->PolicyScope = true;
@@ -425,7 +425,7 @@ bool cmFindPackageCommand
}
else if(args[i] == "NO_MODULE")
{
- this->NoModule = true;
+ this->UseFindModules = false;
doing = DoingNone;
}
else if(args[i] == "REQUIRED")
@@ -440,31 +440,31 @@ bool cmFindPackageCommand
}
else if(args[i] == "NAMES")
{
- this->NoModule = true;
+ this->UseFindModules = false;
this->Compatibility_1_6 = false;
doing = DoingNames;
}
else if(args[i] == "PATHS")
{
- this->NoModule = true;
+ this->UseFindModules = false;
this->Compatibility_1_6 = false;
doing = DoingPaths;
}
else if(args[i] == "HINTS")
{
- this->NoModule = true;
+ this->UseFindModules = false;
this->Compatibility_1_6 = false;
doing = DoingHints;
}
else if(args[i] == "PATH_SUFFIXES")
{
- this->NoModule = true;
+ this->UseFindModules = false;
this->Compatibility_1_6 = false;
doing = DoingPathSuffixes;
}
else if(args[i] == "CONFIGS")
{
- this->NoModule = true;
+ this->UseFindModules = false;
this->Compatibility_1_6 = false;
doing = DoingConfigs;
}
@@ -477,27 +477,27 @@ bool cmFindPackageCommand
else if(args[i] == "NO_CMAKE_PACKAGE_REGISTRY")
{
this->NoUserRegistry = true;
- this->NoModule = true;
+ this->UseFindModules = false;
this->Compatibility_1_6 = false;
doing = DoingNone;
}
else if(args[i] == "NO_CMAKE_SYSTEM_PACKAGE_REGISTRY")
{
this->NoSystemRegistry = true;
- this->NoModule = true;
+ this->UseFindModules = false;
this->Compatibility_1_6 = false;
doing = DoingNone;
}
else if(args[i] == "NO_CMAKE_BUILDS_PATH")
{
this->NoBuilds = true;
- this->NoModule = true;
+ this->UseFindModules = false;
this->Compatibility_1_6 = false;
doing = DoingNone;
}
else if(this->CheckCommonArgument(args[i]))
{
- this->NoModule = true;
+ this->UseFindModules = false;
this->Compatibility_1_6 = false;
doing = DoingNone;
}
@@ -636,7 +636,7 @@ bool cmFindPackageCommand
this->SetModuleVariables(components);
// See if there is a Find<package>.cmake module.
- if(!this->NoModule)
+ if(this->UseFindModules)
{
bool foundModule = false;
if(!this->FindModule(foundModule))
@@ -913,12 +913,12 @@ bool cmFindPackageCommand::HandlePackageMode()
else
{
e << "Could not find ";
- if(!this->NoModule)
+ if(this->UseFindModules)
{
e << "module Find" << this->Name << ".cmake or ";
}
e << "a configuration file for package " << this->Name << ".\n";
- if(!this->NoModule)
+ if(this->UseFindModules)
{
e << "Adjust CMAKE_MODULE_PATH to find Find"
<< this->Name << ".cmake or set ";
diff --git a/Source/cmFindPackageCommand.h b/Source/cmFindPackageCommand.h
index e736352..513c49c 100644
--- a/Source/cmFindPackageCommand.h
+++ b/Source/cmFindPackageCommand.h
@@ -133,7 +133,7 @@ private:
bool Quiet;
bool Required;
bool Compatibility_1_6;
- bool NoModule;
+ bool UseFindModules;
bool NoUserRegistry;
bool NoSystemRegistry;
bool NoBuilds;