diff options
author | Brad King <brad.king@kitware.com> | 2006-04-11 15:06:19 (GMT) |
---|---|---|
committer | Brad King <brad.king@kitware.com> | 2006-04-11 15:06:19 (GMT) |
commit | d5719f22c1dca3e100f1e3b5dfaa4fe7d26796a0 (patch) | |
tree | 714a99bed97290f96ff8f846fa6864cebbdc0a28 /Source/cmCustomCommand.cxx | |
parent | b613cf0be806cc1d37d2b590f1a5ba7898236ae8 (diff) | |
download | CMake-d5719f22c1dca3e100f1e3b5dfaa4fe7d26796a0.zip CMake-d5719f22c1dca3e100f1e3b5dfaa4fe7d26796a0.tar.gz CMake-d5719f22c1dca3e100f1e3b5dfaa4fe7d26796a0.tar.bz2 |
ENH: Added support for multiple outputs generated by a single custom command. For Visual Studio generators the native tool provides support. For Xcode and Makefile generators a simple trick is used. The first output is considered primary and has the build rule attached. Other outputs simply depend on the first output with no build rule. During cmake_check_build_system CMake detects when a secondary output is missing and removes the primary output to make sure all outputs are regenerated. This approach always builds the custom command at the right time and only once even during parallel builds.
Diffstat (limited to 'Source/cmCustomCommand.cxx')
-rw-r--r-- | Source/cmCustomCommand.cxx | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/Source/cmCustomCommand.cxx b/Source/cmCustomCommand.cxx index b66568c..162f10f 100644 --- a/Source/cmCustomCommand.cxx +++ b/Source/cmCustomCommand.cxx @@ -24,7 +24,7 @@ cmCustomCommand::cmCustomCommand() //---------------------------------------------------------------------------- cmCustomCommand::cmCustomCommand(const cmCustomCommand& r): - Output(r.Output), + Outputs(r.Outputs), Depends(r.Depends), CommandLines(r.CommandLines), Comment(r.Comment), @@ -34,12 +34,12 @@ cmCustomCommand::cmCustomCommand(const cmCustomCommand& r): } //---------------------------------------------------------------------------- -cmCustomCommand::cmCustomCommand(const char* output, +cmCustomCommand::cmCustomCommand(const std::vector<std::string>& outputs, const std::vector<std::string>& depends, const cmCustomCommandLines& commandLines, const char* comment, const char* workingDirectory): - Output(output?output:""), + Outputs(outputs), Depends(depends), CommandLines(commandLines), Comment(comment?comment:""), @@ -49,9 +49,9 @@ cmCustomCommand::cmCustomCommand(const char* output, } //---------------------------------------------------------------------------- -const char* cmCustomCommand::GetOutput() const +const std::vector<std::string>& cmCustomCommand::GetOutputs() const { - return this->Output.c_str(); + return this->Outputs; } //---------------------------------------------------------------------------- |