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

ENH: Added creation of XXX_FIND_COMPONENTS list of all components requested with REQUIRED option. This addresses the feature request in bug#3494.

This commit is contained in:
Brad King 2006-07-11 17:10:00 -04:00
parent 981787c9c5
commit 6f52ed1c8e
1 changed files with 31 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
Source/cmFindPackageCommand.cxx
View File

@ -56,6 +56,9 @@ bool cmFindPackageCommand::InitialPass(std::vector<std::string> const& args)
this->Name = args[0]; this->Name = args[0];
// Build a list of required components.
std::string components;
const char* components_sep = "";
bool quiet = false; bool quiet = false;
bool required = false; bool required = false;
if(args.size() > 1) if(args.size() > 1)
@ -74,11 +77,32 @@ bool cmFindPackageCommand::InitialPass(std::vector<std::string> const& args)
} }
else if(args[i] == "REQUIRED") else if(args[i] == "REQUIRED")
{ {
// The package is required.
required = true; required = true;
while (++i < args.size() && args[i] != "QUIET")
// Look for a list of required components.
while(++i < args.size())
{ {
std::string req_var = Name + "_FIND_REQUIRED_" + args[i]; // Stop looking when a known keyword argument is
this->Makefile->AddDefinition(req_var.c_str(), "1"); // encountered.
if((args[i] == "QUIET") ||
(args[i] == "REQUIRED"))
{
--i;
break;
}
else
{
// Set a variable telling the find script this component
// is required.
std::string req_var = Name + "_FIND_REQUIRED_" + args[i];
this->Makefile->AddDefinition(req_var.c_str(), "1");
// Append to the list of required components.
components += components_sep;
components += args[i];
components_sep = ";";
}
} }
} }
else else
@ -89,6 +113,10 @@ bool cmFindPackageCommand::InitialPass(std::vector<std::string> const& args)
return false; return false;
} }
} }
// Store the list of components.
std::string components_var = Name + "_FIND_COMPONENTS";
this->Makefile->AddDefinition(components_var.c_str(), components.c_str());
} }
// See if there is a Find<name>.cmake module. // See if there is a Find<name>.cmake module.