[Cmake-commits] CMake branch, next, updated. v2.8.12.1-6241-g2bb59d0

[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  2bb59d0f5870039e2db72187aee4b727a2dfa068 (commit)
       via  de1571203d77c88dc3f4e2676e3349354c4eb38e (commit)
      from  8099b442c5984f17cd0b58d707972c3d395101d3 (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=2bb59d0f5870039e2db72187aee4b727a2dfa068
commit 2bb59d0f5870039e2db72187aee4b727a2dfa068
Merge: 8099b44 de15712
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Dec 19 09:52:34 2013 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Dec 19 09:52:34 2013 -0500

    Merge topic 'make-entry-no-parallel' into next
    
    de15712 Makefile: Allow "gmake target1 target2 -j" (#14312)


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=de1571203d77c88dc3f4e2676e3349354c4eb38e
commit de1571203d77c88dc3f4e2676e3349354c4eb38e
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Dec 18 16:39:11 2013 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Wed Dec 18 16:45:11 2013 -0500

    Makefile: Allow "gmake target1 target2 -j" (#14312)
    
    Add the .NOTPARALLEL target to each local Makefile command-line
    interface entry point file so that even with -j we launch only
    one "make -f Makefile2" at a time.  The actual build rules
    in Makefile2 and lower will still run in parallel.  Make tools
    that do not understand .NOTPARALLEL will not be hurt.
    
    Suggested-by: Robert Luberda <robert-cmake at debian.org>

diff --git a/Source/cmLocalUnixMakefileGenerator3.cxx b/Source/cmLocalUnixMakefileGenerator3.cxx
index 6ca386c..ea2fbd1 100644
--- a/Source/cmLocalUnixMakefileGenerator3.cxx
+++ b/Source/cmLocalUnixMakefileGenerator3.cxx
@@ -1686,6 +1686,12 @@ void cmLocalUnixMakefileGenerator3
                       "default_target",
                       depends,
                       no_commands, true);
+
+  // Help out users that try "gmake target1 target2 -j".
+  std::vector<std::string> no_depends;
+  this->WriteMakeRule(ruleFileStream,
+    "Allow only one \"make -f Makefile2\" at a time, but pass parallelism.",
+    ".NOTPARALLEL", no_depends, no_commands, true);
   }
 
   this->WriteSpecialTargetsTop(ruleFileStream);

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

Summary of changes:
 Source/cmLocalUnixMakefileGenerator3.cxx |    6 ++++++
 1 files changed, 6 insertions(+), 0 deletions(-)


hooks/post-receive
-- 
CMake