diff options
author | Brad King <brad.king@kitware.com> | 2015-03-09 13:45:51 (GMT) |
---|---|---|
committer | CMake Topic Stage <kwrobot@kitware.com> | 2015-03-09 13:45:51 (GMT) |
commit | 387466dd9508ae57a864cdd8f2c8d8d28140b74c (patch) | |
tree | 31b689ec4ecfa9a1a6d348da62d3b31f151a8d35 /Source/cmMakefileTargetGenerator.h | |
parent | bdb00b36133c64a36fbba7fd6c648725062b6732 (diff) | |
parent | 66a9c90c4bb5bf93bd570a423f99486b24b9337d (diff) | |
download | CMake-387466dd9508ae57a864cdd8f2c8d8d28140b74c.zip CMake-387466dd9508ae57a864cdd8f2c8d8d28140b74c.tar.gz CMake-387466dd9508ae57a864cdd8f2c8d8d28140b74c.tar.bz2 |
Merge topic 'custom-command-multiple-outputs'
66a9c90c Makefile: Fix multiple custom command outputs regression (#15116)
Diffstat (limited to 'Source/cmMakefileTargetGenerator.h')
-rw-r--r-- | Source/cmMakefileTargetGenerator.h | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/Source/cmMakefileTargetGenerator.h b/Source/cmMakefileTargetGenerator.h index b072cfa..98017be 100644 --- a/Source/cmMakefileTargetGenerator.h +++ b/Source/cmMakefileTargetGenerator.h @@ -222,6 +222,16 @@ protected: // Set of extra output files to be driven by the build. std::set<std::string> ExtraFiles; + typedef std::map<std::string, std::string> MultipleOutputPairsType; + MultipleOutputPairsType MultipleOutputPairs; + void 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. std::string TargetNameOut; std::string TargetNameSO; |