diff options
| author | Brad King <brad.king@kitware.com> | 2015-04-10 17:03:34 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2015-04-10 20:27:42 (GMT) |
| commit | 9660a3cceae12ebb3cdc49484dcef590a12eb33c (patch) | |
| tree | d428b0ccad4c23027ea6adeab4decc7b858e9a3e /Source/cmMakefileTargetGenerator.h | |
| parent | 5c08e2559cf8ad5fc3cb220396016cf816a7b4b8 (diff) | |
| download | CMake-9660a3cceae12ebb3cdc49484dcef590a12eb33c.zip CMake-9660a3cceae12ebb3cdc49484dcef590a12eb33c.tar.gz CMake-9660a3cceae12ebb3cdc49484dcef590a12eb33c.tar.bz2 | |
Makefile: Fix multiple custom command outputs with one missing
The use of "cmake -E touch_nocreate" added in commit v3.2.1~4^2
(Makefile: Fix multiple custom command outputs regression, 2015-03-06)
caused builds to fail when one of the outputs is intentionally not
created. This was fixed by our parent commit by making touch_nocreate
succeed when the file is missing. Add a test case covering it.
For the Watcom WMake generator, check for the SYMBOLIC source file
property separately on each output. The mark is needed on outputs that
are not really created to tell 'wmake' not to complain that it is
missing. The mark is also needed on outputs that are created or 'wmake'
will not consider them out of date when they exist.
Inspired-by: Ben Boeckel <ben.boeckel@kitware.com>
Diffstat (limited to 'Source/cmMakefileTargetGenerator.h')
| -rw-r--r-- | Source/cmMakefileTargetGenerator.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/Source/cmMakefileTargetGenerator.h b/Source/cmMakefileTargetGenerator.h index f62c51d..42c4f58 100644 --- a/Source/cmMakefileTargetGenerator.h +++ b/Source/cmMakefileTargetGenerator.h @@ -224,12 +224,11 @@ protected: typedef std::map<std::string, std::string> MultipleOutputPairsType; MultipleOutputPairsType MultipleOutputPairs; - void WriteMakeRule(std::ostream& os, + bool WriteMakeRule(std::ostream& os, const char* comment, const std::vector<std::string>& outputs, const std::vector<std::string>& depends, const std::vector<std::string>& commands, - bool symbolic, bool in_help = false); // Target name info. |