[Cmake-commits] CMake branch, next, updated. v3.2.0-877-g68c97b4

[Brad King]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
       via  68c97b483a678ae46abc7b26f10ea3e0908d4411 (commit)
       via  28a9569214df943df4b93ac6003292c735fba4ed (commit)
      from  f377a0273265f61a1fd056e63ab106020262827e (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=68c97b483a678ae46abc7b26f10ea3e0908d4411
commit 68c97b483a678ae46abc7b26f10ea3e0908d4411
Merge: f377a02 28a9569
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri Mar 6 18:11:39 2015 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Mar 6 18:11:39 2015 -0500

    Merge topic 'custom-command-multiple-outputs' into next
    
    28a95692 fixup! Makefile: Use witness for multiple custom command outputs (#15116)


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=28a9569214df943df4b93ac6003292c735fba4ed
commit 28a9569214df943df4b93ac6003292c735fba4ed
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri Mar 6 18:04:18 2015 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Fri Mar 6 18:08:15 2015 -0500

    fixup! Makefile: Use witness for multiple custom command outputs (#15116)
    
    Do not consider touching a symbolic output.

diff --git a/Source/cmMakefileTargetGenerator.cxx b/Source/cmMakefileTargetGenerator.cxx
index 973e0dc..4ece016 100644
--- a/Source/cmMakefileTargetGenerator.cxx
+++ b/Source/cmMakefileTargetGenerator.cxx
@@ -1022,15 +1022,21 @@ void cmMakefileTargetGenerator::WriteMakeRule(
     // but only if the output was acually created.
     std::string const out = this->Convert(*o, cmLocalGenerator::HOME_OUTPUT,
                                           cmLocalGenerator::SHELL);
-    std::vector<std::string> output_commands(
-      1,"@$(CMAKE_COMMAND) -E touch_nocreate " + out);
+    std::vector<std::string> output_commands;
+    if (!symbolic)
+      {
+      output_commands.push_back("@$(CMAKE_COMMAND) -E touch_nocreate " + out);
+      }
     this->LocalGenerator->WriteMakeRule(os, 0, *o, output_depends,
                                         output_commands, symbolic, in_help);
 
-    // At build time, remove the first output if this one does not exist
-    // so that make will rerun the real commands that create this one.
-    MultipleOutputPairsType::value_type p(*o, outputs[0]);
-    this->MultipleOutputPairs.insert(p);
+    if (!symbolic)
+      {
+      // At build time, remove the first output if this one does not exist
+      // so that "make" will rerun the real commands that create this one.
+      MultipleOutputPairsType::value_type p(*o, outputs[0]);
+      this->MultipleOutputPairs.insert(p);
+      }
     }
 }
 

-----------------------------------------------------------------------

Summary of changes:
 Source/cmMakefileTargetGenerator.cxx |   18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)


hooks/post-receive
-- 
CMake