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

STYLE: rename FILENAME keyword to FILE, because FILENAME is used in no other 

place

Alex
This commit is contained in:
Alexander Neundorf 2007-08-30 16:22:01 -04:00
parent 52bf51b425
commit 34e3ce9e4e
2 changed files with 17 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
Source/cmInstallCommand.cxx
View File

@ -152,6 +152,15 @@ bool cmInstallCommand::HandleScriptMode(std::vector<std::string> const& args)
return true; return true;
} }
/*struct InstallPart
{
InstallPart(cmCommandArgumentsHelper* helper, const char* key,
cmCommandArgumentGroup* group);
cmCAStringVector argVector;
cmInstallCommandArguments args;
};*/
//---------------------------------------------------------------------------- //----------------------------------------------------------------------------
bool cmInstallCommand::HandleTargetsMode(std::vector<std::string> const& args) bool cmInstallCommand::HandleTargetsMode(std::vector<std::string> const& args)
{ {
@ -1010,7 +1019,7 @@ bool cmInstallCommand::HandleExportMode(std::vector<std::string> const& args)
cmInstallCommandArguments ica; cmInstallCommandArguments ica;
cmCAStringVector exports(&ica.Parser, "EXPORT"); cmCAStringVector exports(&ica.Parser, "EXPORT");
cmCAString prefix(&ica.Parser, "PREFIX", &ica.ArgumentGroup); cmCAString prefix(&ica.Parser, "PREFIX", &ica.ArgumentGroup);
cmCAString filename(&ica.Parser, "FILENAME", &ica.ArgumentGroup); cmCAString filename(&ica.Parser, "FILE", &ica.ArgumentGroup);
exports.Follows(0); exports.Follows(0);
ica.ArgumentGroup.Follows(&exports); ica.ArgumentGroup.Follows(&exports);
@ -1043,6 +1052,9 @@ bool cmInstallCommand::HandleExportMode(std::vector<std::string> const& args)
GetExportSet(exportIt->c_str()); GetExportSet(exportIt->c_str());
if (exportSet == 0) if (exportSet == 0)
{ {
cmOStringStream e;
e << "EXPORT given unknown export name \"" << exportIt->c_str() << "\".";
this->SetError(e.str().c_str());
return false; return false;
} }
@ -1058,6 +1070,9 @@ bool cmInstallCommand::HandleExportMode(std::vector<std::string> const& args)
} }
else else
{ {
cmOStringStream e;
e << "EXPORT failed, maybe a target is exported more than once.";
this->SetError(e.str().c_str());
delete exportGenerator; delete exportGenerator;
return false; return false;
} }

1
Source/cmInstallExportGenerator.cxx
View File

@ -154,6 +154,7 @@ bool cmInstallExportGenerator::SetExportSet(const char* name,
if (targetName == this->Targets[i]->Target->GetName()) if (targetName == this->Targets[i]->Target->GetName())
{ {
targetWithProps = this->Targets[i]; targetWithProps = this->Targets[i];
break;
} }
} }