[Cmake-commits] CMake branch, next, updated. v3.1.1-2498-g1299255

[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  12992551e8100fe99d47e71445af53c2cc06e445 (commit)
       via  3cec0c75f73cc3d5c68cbb9e03e94ed38d60d0a9 (commit)
      from  0a278bea71a2927874c95d44710424b87bf7a72d (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=12992551e8100fe99d47e71445af53c2cc06e445
commit 12992551e8100fe99d47e71445af53c2cc06e445
Merge: 0a278be 3cec0c7
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri Jan 30 09:59:26 2015 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Jan 30 09:59:26 2015 -0500

    Merge topic 'make-NOTPARALLEL-not-PHONY' into next
    
    3cec0c75 Makefile: Generate .NOTPARALLEL without .PHONY (#14312)


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=3cec0c75f73cc3d5c68cbb9e03e94ed38d60d0a9
commit 3cec0c75f73cc3d5c68cbb9e03e94ed38d60d0a9
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri Jan 30 09:50:09 2015 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Fri Jan 30 09:50:09 2015 -0500

    Makefile: Generate .NOTPARALLEL without .PHONY (#14312)
    
    In commit v3.0.0-rc1~222^2 (Makefile: Allow "gmake target1 target2 -j",
    2013-12-18) we added generation of a .NOTPARALLEL rule and told the
    generator it is "symbolic" because the file will never be created.
    This causes ".PHONY" to be used.  However, "clearmake" does not support
    parsing of .PHONY specifically for .NOTPARALLEL, so simply drop it.
    This should not affect the role of the .NOTPARALLEL rule for GNU make.

diff --git a/Source/cmLocalUnixMakefileGenerator3.cxx b/Source/cmLocalUnixMakefileGenerator3.cxx
index f825f5f..fbf2140 100644
--- a/Source/cmLocalUnixMakefileGenerator3.cxx
+++ b/Source/cmLocalUnixMakefileGenerator3.cxx
@@ -1826,7 +1826,7 @@ void cmLocalUnixMakefileGenerator3
     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);
+      ".NOTPARALLEL", no_depends, no_commands, false);
     }
   }
 

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

Summary of changes:
 Source/cmLocalUnixMakefileGenerator3.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)


hooks/post-receive
-- 
CMake