diff options
author | Brad King <brad.king@kitware.com> | 2014-12-08 14:07:18 (GMT) |
---|---|---|
committer | CMake Topic Stage <kwrobot@kitware.com> | 2014-12-08 14:07:18 (GMT) |
commit | e72987dc11b17a9c0630ba053dc4d6488f751002 (patch) | |
tree | 25c0e48b6bfba986e92de4f9d3285aaf4a7e40a5 /Source/cmMakefileTargetGenerator.h | |
parent | cf54d8597d23141273f6e2a07f00ece959bb06e3 (diff) | |
parent | 6c67b8168cd44e5900982ca3e36049792934d83d (diff) | |
download | CMake-e72987dc11b17a9c0630ba053dc4d6488f751002.zip CMake-e72987dc11b17a9c0630ba053dc4d6488f751002.tar.gz CMake-e72987dc11b17a9c0630ba053dc4d6488f751002.tar.bz2 |
Merge topic 'custom-command-multiple-outputs'
6c67b816 Makefile: Workaround Borland Make bug with multiple outputs
65ea5eb7 Tests: Cover rebuild with multiple custom command outputs (#15116)
644b4688 Makefile: Fix rebuild with multiple custom command outputs (#15116)
8a4c6d2d Xcode: Fix rebuild with multiple custom command outputs (#15116)
Diffstat (limited to 'Source/cmMakefileTargetGenerator.h')
-rw-r--r-- | Source/cmMakefileTargetGenerator.h | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/Source/cmMakefileTargetGenerator.h b/Source/cmMakefileTargetGenerator.h index 9fac574..e31e086 100644 --- a/Source/cmMakefileTargetGenerator.h +++ b/Source/cmMakefileTargetGenerator.h @@ -142,15 +142,6 @@ protected: // Lookup the link rule for this target. std::string GetLinkRule(const std::string& linkRuleVar); - /** In order to support parallel builds for custom commands with - multiple outputs the outputs are given a serial order, and only - the first output actually has the build rule. Other outputs - just depend on the first one. The check-build-system step must - remove a dependee if the depender is missing to make sure both - are regenerated properly. This method is used by the local - makefile generators to register such pairs. */ - void AddMultipleOutputPair(const char* depender, const char* dependee); - /** Create a script to hold link rules and a command to invoke the script at build time. */ void CreateLinkScript(const char* name, @@ -231,9 +222,6 @@ 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; - // Target name info. std::string TargetNameOut; std::string TargetNameSO; |