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

Makefiles: Change signature of AppendCustomCommand 

The RelativeRoot parameter will become non-default.
This commit is contained in:
Stephen Kelly 2016-08-27 13:44:52 +02:00
parent e0fd2d0446
commit 6960516b6b
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Source/cmLocalUnixMakefileGenerator3.cxx
View File

@ -905,14 +905,14 @@ void cmLocalUnixMakefileGenerator3::AppendCustomCommands(
for (std::vector<cmCustomCommand>::const_iterator i = ccs.begin();
i != ccs.end(); ++i) {
cmCustomCommandGenerator ccg(*i, this->ConfigName, this);
this->AppendCustomCommand(commands, ccg, target, true, relative);
this->AppendCustomCommand(commands, ccg, target, relative, true);
}
}
void cmLocalUnixMakefileGenerator3::AppendCustomCommand(
std::vector<std::string>& commands, cmCustomCommandGenerator const& ccg,
cmGeneratorTarget* target, bool echo_comment,
cmOutputConverter::RelativeRoot relative, std::ostream* content)
cmGeneratorTarget* target, cmOutputConverter::RelativeRoot relative,
bool echo_comment, std::ostream* content)
{
// Optionally create a command to display the custom command's
// comment text. This is used for pre-build, pre-link, and

4
Source/cmLocalUnixMakefileGenerator3.h
View File

@ -234,9 +234,9 @@ protected:
cmOutputConverter::RelativeRoot relative = cmOutputConverter::HOME_OUTPUT);
void AppendCustomCommand(
std::vector<std::string>& commands, cmCustomCommandGenerator const& ccg,
cmGeneratorTarget* target, bool echo_comment = false,
cmGeneratorTarget* target,
cmOutputConverter::RelativeRoot relative = cmOutputConverter::HOME_OUTPUT,
std::ostream* content = CM_NULLPTR);
bool echo_comment = false, std::ostream* content = CM_NULLPTR);
void AppendCleanCommand(std::vector<std::string>& commands,
const std::vector<std::string>& files,
cmGeneratorTarget* target,

4
Source/cmMakefileTargetGenerator.cxx
View File

@ -1094,8 +1094,8 @@ void cmMakefileTargetGenerator::GenerateCustomRuleFile(
// Now append the actual user-specified commands.
std::ostringstream content;
this->LocalGenerator->AppendCustomCommand(
commands, ccg, this->GeneratorTarget, false,
cmOutputConverter::HOME_OUTPUT, &content);
commands, ccg, this->GeneratorTarget, cmOutputConverter::HOME_OUTPUT,
false, &content);
// Collect the dependencies.
std::vector<std::string> depends;