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

find_package: add CONFIG mode keyword alias for NO_MODULE

This commit is contained in:
Alex Neundorf 2012-02-20 22:09:10 +01:00 committed by Brad King
parent f310f67291
commit 9c39bbd474
1 changed files with 21 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
Source/cmFindPackageCommand.cxx
View File

@ -130,7 +130,8 @@ void cmFindPackageCommand::GenerateDocumentation()
"proceeds to Config mode.\n" "proceeds to Config mode.\n"
"The complete Config mode command signature is:\n" "The complete Config mode command signature is:\n"
" find_package(<package> [version] [EXACT] [QUIET]\n" " find_package(<package> [version] [EXACT] [QUIET]\n"
" [[REQUIRED|COMPONENTS] [components...]] [NO_MODULE]\n" " [[REQUIRED|COMPONENTS] [components...]]\n"
" [CONFIG|NO_MODULE]\n"
" [NO_POLICY_SCOPE]\n" " [NO_POLICY_SCOPE]\n"
" [NAMES name1 [name2 ...]]\n" " [NAMES name1 [name2 ...]]\n"
" [CONFIGS config1 [config2 ...]]\n" " [CONFIGS config1 [config2 ...]]\n"
@ -148,9 +149,10 @@ void cmFindPackageCommand::GenerateDocumentation()
" [CMAKE_FIND_ROOT_PATH_BOTH |\n" " [CMAKE_FIND_ROOT_PATH_BOTH |\n"
" ONLY_CMAKE_FIND_ROOT_PATH |\n" " ONLY_CMAKE_FIND_ROOT_PATH |\n"
" NO_CMAKE_FIND_ROOT_PATH])\n" " NO_CMAKE_FIND_ROOT_PATH])\n"
"The NO_MODULE option may be used to skip Module mode explicitly. " "The CONFIG option may be used to skip Module mode explicitly and "
"It is also implied by use of options not specified in the reduced " "switch to Config mode. It is synonymous to using NO_MODULE. "
"signature. " "Config mode is also implied by use of options not specified in the "
"reduced signature. "
"\n" "\n"
"Config mode attempts to locate a configuration file provided by the " "Config mode attempts to locate a configuration file provided by the "
"package to be found. A cache entry called <package>_DIR is created to " "package to be found. A cache entry called <package>_DIR is created to "
@ -442,6 +444,21 @@ bool cmFindPackageCommand
doing = DoingNone; doing = DoingNone;
haveModeString = args[i]; haveModeString = args[i];
} }
else if(args[i] == "CONFIG")
{
if(!haveModeString.empty())
{
cmOStringStream e;
e << "given " << args[i] << ", but mode is already set to "
<< haveModeString << ".";
this->SetError(e.str().c_str());
return false;
}
this->UseFindModules = false;
doing = DoingNone;
haveModeString = args[i];
}
else if(args[i] == "NO_MODULE") else if(args[i] == "NO_MODULE")
{ {
if(!haveModeString.empty()) if(!haveModeString.empty())