diff options
author | Brad King <brad.king@kitware.com> | 2014-12-05 14:55:49 (GMT) |
---|---|---|
committer | Brad King <brad.king@kitware.com> | 2014-12-05 14:55:49 (GMT) |
commit | 644b4688d71cc52f8499d6103495de0909319557 (patch) | |
tree | 86102a74cc0b93a2b4915089952458d666beb61e /Source/cmMakefileTargetGenerator.h | |
parent | 8a4c6d2d2e66d210e5c2d59c86b3f1bff2582867 (diff) | |
download | CMake-644b4688d71cc52f8499d6103495de0909319557.zip CMake-644b4688d71cc52f8499d6103495de0909319557.tar.gz CMake-644b4688d71cc52f8499d6103495de0909319557.tar.bz2 |
Makefile: Fix rebuild with multiple custom command outputs (#15116)
Fix the generated makefiles for custom commands with multiple outputs to
list all the outputs on the left hand side of the build rule. This is
much simpler and more reliable than the old multiple-output-pair
infrastructure.
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; |