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

Merge topic 'dev/custom-target-performance' 

6208c285 cmMakefile: Defer dependency calculations
dc2e26df cmMakefile: Avoid excess source files
d2803fba cmMakefile: Add a CreateSource method
This commit is contained in:
Brad King 2014-07-09 10:02:47 -04:00 committed by CMake Topic Stage
parent e187351c5f 6208c285c8
commit aaea11e353
3 changed files with 61 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Source/cmGetSourceFilePropertyCommand.cxx
View File

@ -29,7 +29,7 @@ bool cmGetSourceFilePropertyCommand
// for the location we must create a source file first
if (!sf && args[2] == "LOCATION")
{
sf = this->Makefile->GetOrCreateSource(file);
sf = this->Makefile->CreateSource(file);
}
if(sf)
{

95
Source/cmMakefile.cxx
View File

@ -989,7 +989,7 @@ cmMakefile::AddCustomCommandToOutput(const std::vector<std::string>& outputs,
// Choose a source file on which to store the custom command.
cmSourceFile* file = 0;
if(!main_dependency.empty())
if(!commandLines.empty() && !main_dependency.empty())
{
// The main dependency was specified. Use it unless a different
// custom command already used it.
@ -1010,11 +1010,9 @@ cmMakefile::AddCustomCommandToOutput(const std::vector<std::string>& outputs,
file = 0;
}
}
else
else if (!file)
{
// The main dependency does not have a custom command or we are
// allowed to replace it. Use it to store the command.
file = this->GetOrCreateSource(main_dependency);
file = this->CreateSource(main_dependency);
}
}
@ -1041,8 +1039,11 @@ cmMakefile::AddCustomCommandToOutput(const std::vector<std::string>& outputs,
}
// Create a cmSourceFile for the rule file.
file = this->GetOrCreateSource(outName, true);
file->SetProperty("__CMAKE_RULE", "1");
if (!file)
{
file = this->CreateSource(outName, true);
file->SetProperty("__CMAKE_RULE", "1");
}
}
// Always create the output sources and mark them generated.
@ -1055,16 +1056,16 @@ cmMakefile::AddCustomCommandToOutput(const std::vector<std::string>& outputs,
}
}
// Construct a complete list of dependencies.
std::vector<std::string> depends2(depends);
if(!main_dependency.empty())
{
depends2.push_back(main_dependency);
}
// Attach the custom command to the file.
if(file)
{
// Construct a complete list of dependencies.
std::vector<std::string> depends2(depends);
if(!main_dependency.empty())
{
depends2.push_back(main_dependency);
}
cmCustomCommand* cc =
new cmCustomCommand(this, outputs, depends2, commandLines,
comment, workingDir);
@ -1256,28 +1257,31 @@ cmMakefile::AddUtilityCommand(const std::string& utilityName,
}
// Store the custom command in the target.
std::string force = this->GetStartOutputDirectory();
force += cmake::GetCMakeFilesDirectory();
force += "/";
force += utilityName;
std::string no_main_dependency = "";
bool no_replace = false;
this->AddCustomCommandToOutput(force, depends,
no_main_dependency,
commandLines, comment,
workingDirectory, no_replace,
escapeOldStyle);
cmSourceFile* sf = target->AddSourceCMP0049(force);
if (!commandLines.empty() || !depends.empty())
{
std::string force = this->GetStartOutputDirectory();
force += cmake::GetCMakeFilesDirectory();
force += "/";
force += utilityName;
std::string no_main_dependency = "";
bool no_replace = false;
this->AddCustomCommandToOutput(force, depends,
no_main_dependency,
commandLines, comment,
workingDirectory, no_replace,
escapeOldStyle);
cmSourceFile* sf = target->AddSourceCMP0049(force);
// The output is not actually created so mark it symbolic.
if(sf)
{
sf->SetProperty("SYMBOLIC", "1");
}
else
{
cmSystemTools::Error("Could not get source file entry for ",
force.c_str());
// The output is not actually created so mark it symbolic.
if(sf)
{
sf->SetProperty("SYMBOLIC", "1");
}
else
{
cmSystemTools::Error("Could not get source file entry for ",
force.c_str());
}
}
return target;
}
@ -3450,6 +3454,19 @@ cmSourceFile* cmMakefile::GetSource(const std::string& sourceName) const
return 0;
}
//----------------------------------------------------------------------------
cmSourceFile* cmMakefile::CreateSource(const std::string& sourceName,
bool generated)
{
cmSourceFile* sf = new cmSourceFile(this, sourceName);
if(generated)
{
sf->SetProperty("GENERATED", "1");
}
this->SourceFiles.push_back(sf);
return sf;
}
//----------------------------------------------------------------------------
cmSourceFile* cmMakefile::GetOrCreateSource(const std::string& sourceName,
bool generated)
@ -3460,13 +3477,7 @@ cmSourceFile* cmMakefile::GetOrCreateSource(const std::string& sourceName,
}
else
{
cmSourceFile* sf = new cmSourceFile(this, sourceName);
if(generated)
{
sf->SetProperty("GENERATED", "1");
}
this->SourceFiles.push_back(sf);
return sf;
return this->CreateSource(sourceName, generated);
}
}

7
Source/cmMakefile.h
View File

@ -560,6 +560,13 @@ public:
*/
cmSourceFile* GetSource(const std::string& sourceName) const;
/** Create the source file and return it. generated
* indicates if it is a generated file, this is used in determining
* how to create the source file instance e.g. name
*/
cmSourceFile* CreateSource(const std::string& sourceName,
bool generated = false);
/** Get a cmSourceFile pointer for a given source name, if the name is
* not found, then create the source file and return it. generated
* indicates if it is a generated file, this is used in determining