diff options
Diffstat (limited to 'Source/cmMakefile.cxx')
| -rw-r--r-- | Source/cmMakefile.cxx | 29 |
1 files changed, 17 insertions, 12 deletions
diff --git a/Source/cmMakefile.cxx b/Source/cmMakefile.cxx index 6c390f7..ca5f009 100644 --- a/Source/cmMakefile.cxx +++ b/Source/cmMakefile.cxx @@ -814,8 +814,8 @@ void cmMakefile::AddCustomCommandToTarget( const std::vector<std::string>& depends, const cmCustomCommandLines& commandLines, cmTarget::CustomCommandType type, const char* comment, const char* workingDir, bool escapeOldStyle, - bool uses_terminal, const std::string& depfile, bool command_expand_lists, - ObjectLibraryCommands objLibraryCommands) + bool uses_terminal, const std::string& depfile, const std::string& job_pool, + bool command_expand_lists, ObjectLibraryCommands objLibraryCommands) { // Find the target to which to add the custom command. cmTargets::iterator ti = this->Targets.find(target); @@ -890,6 +890,7 @@ void cmMakefile::AddCustomCommandToTarget( cc.SetUsesTerminal(uses_terminal); cc.SetCommandExpandLists(command_expand_lists); cc.SetDepfile(depfile); + cc.SetJobPool(job_pool); switch (type) { case cmTarget::PRE_BUILD: t.AddPreBuildCommand(cc); @@ -909,7 +910,8 @@ cmSourceFile* cmMakefile::AddCustomCommandToOutput( const std::vector<std::string>& depends, const std::string& main_dependency, const cmCustomCommandLines& commandLines, const char* comment, const char* workingDir, bool replace, bool escapeOldStyle, - bool uses_terminal, bool command_expand_lists, const std::string& depfile) + bool uses_terminal, bool command_expand_lists, const std::string& depfile, + const std::string& job_pool) { // Make sure there is at least one output. if (outputs.empty()) { @@ -1003,6 +1005,7 @@ cmSourceFile* cmMakefile::AddCustomCommandToOutput( cc->SetUsesTerminal(uses_terminal); cc->SetCommandExpandLists(command_expand_lists); cc->SetDepfile(depfile); + cc->SetJobPool(job_pool); file->SetCustomCommand(cc); this->UpdateOutputToSourceMap(outputs, file); } @@ -1040,7 +1043,7 @@ cmSourceFile* cmMakefile::AddCustomCommandToOutput( const std::string& main_dependency, const cmCustomCommandLines& commandLines, const char* comment, const char* workingDir, bool replace, bool escapeOldStyle, bool uses_terminal, bool command_expand_lists, - const std::string& depfile) + const std::string& depfile, const std::string& job_pool) { std::vector<std::string> outputs; outputs.push_back(output); @@ -1048,7 +1051,7 @@ cmSourceFile* cmMakefile::AddCustomCommandToOutput( return this->AddCustomCommandToOutput( outputs, no_byproducts, depends, main_dependency, commandLines, comment, workingDir, replace, escapeOldStyle, uses_terminal, command_expand_lists, - depfile); + depfile, job_pool); } void cmMakefile::AddCustomCommandOldStyle( @@ -1142,13 +1145,14 @@ cmTarget* cmMakefile::AddUtilityCommand( const std::string& utilityName, TargetOrigin origin, bool excludeFromAll, const char* workingDirectory, const std::vector<std::string>& depends, const cmCustomCommandLines& commandLines, bool escapeOldStyle, - const char* comment, bool uses_terminal, bool command_expand_lists) + const char* comment, bool uses_terminal, bool command_expand_lists, + const std::string& job_pool) { std::vector<std::string> no_byproducts; - return this->AddUtilityCommand(utilityName, origin, excludeFromAll, - workingDirectory, no_byproducts, depends, - commandLines, escapeOldStyle, comment, - uses_terminal, command_expand_lists); + return this->AddUtilityCommand( + utilityName, origin, excludeFromAll, workingDirectory, no_byproducts, + depends, commandLines, escapeOldStyle, comment, uses_terminal, + command_expand_lists, job_pool); } cmTarget* cmMakefile::AddUtilityCommand( @@ -1156,7 +1160,8 @@ cmTarget* cmMakefile::AddUtilityCommand( const char* workingDirectory, const std::vector<std::string>& byproducts, const std::vector<std::string>& depends, const cmCustomCommandLines& commandLines, bool escapeOldStyle, - const char* comment, bool uses_terminal, bool command_expand_lists) + const char* comment, bool uses_terminal, bool command_expand_lists, + const std::string& job_pool) { // Create a target instance for this utility. cmTarget* target = this->AddNewTarget(cmStateEnums::UTILITY, utilityName); @@ -1182,7 +1187,7 @@ cmTarget* cmMakefile::AddUtilityCommand( this->AddCustomCommandToOutput( forced, byproducts, depends, no_main_dependency, commandLines, comment, workingDirectory, no_replace, escapeOldStyle, uses_terminal, - command_expand_lists); + command_expand_lists, /*depfile=*/"", job_pool); cmSourceFile* sf = target->AddSourceCMP0049(force); // The output is not actually created so mark it symbolic. |