diff options
| author | Stephen Kelly <steveire@gmail.com> | 2016-08-27 11:44:52 (GMT) |
|---|---|---|
| committer | Stephen Kelly <steveire@gmail.com> | 2016-08-27 11:44:52 (GMT) |
| commit | 6960516b6b053816313d2ff5ee4e9375a84829cb (patch) | |
| tree | 442b0c0d99ffe4c44b1cc5eab1173b0066193159 | |
| parent | e0fd2d0446101847dd40cfe4cc451667d04ddcd9 (diff) | |
| download | CMake-6960516b6b053816313d2ff5ee4e9375a84829cb.zip CMake-6960516b6b053816313d2ff5ee4e9375a84829cb.tar.gz CMake-6960516b6b053816313d2ff5ee4e9375a84829cb.tar.bz2 | |
Makefiles: Change signature of AppendCustomCommand
The RelativeRoot parameter will become non-default.
| -rw-r--r-- | Source/cmLocalUnixMakefileGenerator3.cxx | 6 | ||||
| -rw-r--r-- | Source/cmLocalUnixMakefileGenerator3.h | 4 | ||||
| -rw-r--r-- | Source/cmMakefileTargetGenerator.cxx | 4 |
3 files changed, 7 insertions, 7 deletions
diff --git a/Source/cmLocalUnixMakefileGenerator3.cxx b/Source/cmLocalUnixMakefileGenerator3.cxx index 0169b47..a2ac38a 100644 --- a/Source/cmLocalUnixMakefileGenerator3.cxx +++ b/Source/cmLocalUnixMakefileGenerator3.cxx @@ -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 diff --git a/Source/cmLocalUnixMakefileGenerator3.h b/Source/cmLocalUnixMakefileGenerator3.h index 5e1b651..ed167b3 100644 --- a/Source/cmLocalUnixMakefileGenerator3.h +++ b/Source/cmLocalUnixMakefileGenerator3.h @@ -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, diff --git a/Source/cmMakefileTargetGenerator.cxx b/Source/cmMakefileTargetGenerator.cxx index 8f14e8c..0c637a9 100644 --- a/Source/cmMakefileTargetGenerator.cxx +++ b/Source/cmMakefileTargetGenerator.cxx @@ -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; |