[Cmake-commits] CMake branch, next, updated. v2.8.12.1-6269-g67f3445

[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  67f344545c7131b585742a5c0ffdf4f60bc5e4ab (commit)
       via  04f6dd0cd5ddf611578e7337024be9043a0e8ede (commit)
      from  8bb86990b946d276174a855fb4aa5d1ddb91fa01 (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=67f344545c7131b585742a5c0ffdf4f60bc5e4ab
commit 67f344545c7131b585742a5c0ffdf4f60bc5e4ab
Merge: 8bb8699 04f6dd0
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Dec 19 11:02:58 2013 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Dec 19 11:02:58 2013 -0500

    Merge topic 'make-entry-no-parallel' into next
    
    04f6dd0 Makefile: No .NOTPARALLEL on Borland or Watcom


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=04f6dd0cd5ddf611578e7337024be9043a0e8ede
commit 04f6dd0cd5ddf611578e7337024be9043a0e8ede
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Dec 19 11:01:49 2013 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Thu Dec 19 11:01:49 2013 -0500

    Makefile: No .NOTPARALLEL on Borland or Watcom
    
    These make tools do not tolerate the empty target.

diff --git a/Source/cmGlobalBorlandMakefileGenerator.h b/Source/cmGlobalBorlandMakefileGenerator.h
index bd3db3e..70004ea 100644
--- a/Source/cmGlobalBorlandMakefileGenerator.h
+++ b/Source/cmGlobalBorlandMakefileGenerator.h
@@ -44,6 +44,8 @@ public:
    */
   virtual void EnableLanguage(std::vector<std::string>const& languages,
                               cmMakefile *, bool optional);
+
+  virtual bool AllowNotParallel() const { return false; }
 };
 
 #endif
diff --git a/Source/cmGlobalUnixMakefileGenerator3.h b/Source/cmGlobalUnixMakefileGenerator3.h
index 284f5d1..ec2e1df 100644
--- a/Source/cmGlobalUnixMakefileGenerator3.h
+++ b/Source/cmGlobalUnixMakefileGenerator3.h
@@ -125,6 +125,9 @@ public:
                             const std::string &workingDirectory,
                             const std::string &compileCommand);
 
+  /** Does the make tool tolerate .NOTPARALLEL? */
+  virtual bool AllowNotParallel() const { return true; }
+
 protected:
   void WriteMainMakefile2();
   void WriteMainCMakefile();
diff --git a/Source/cmGlobalWatcomWMakeGenerator.h b/Source/cmGlobalWatcomWMakeGenerator.h
index 23e60a1..d5350ef 100644
--- a/Source/cmGlobalWatcomWMakeGenerator.h
+++ b/Source/cmGlobalWatcomWMakeGenerator.h
@@ -43,6 +43,8 @@ public:
    */
   virtual void EnableLanguage(std::vector<std::string>const& languages,
                               cmMakefile *, bool optional);
+
+  virtual bool AllowNotParallel() const { return false; }
 };
 
 #endif
diff --git a/Source/cmLocalUnixMakefileGenerator3.cxx b/Source/cmLocalUnixMakefileGenerator3.cxx
index ea2fbd1..ec1d2c4 100644
--- a/Source/cmLocalUnixMakefileGenerator3.cxx
+++ b/Source/cmLocalUnixMakefileGenerator3.cxx
@@ -1688,10 +1688,15 @@ void cmLocalUnixMakefileGenerator3
                       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);
+  cmGlobalUnixMakefileGenerator3* gg =
+    static_cast<cmGlobalUnixMakefileGenerator3*>(this->GlobalGenerator);
+  if(gg->AllowNotParallel())
+    {
+    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/cmGlobalBorlandMakefileGenerator.h |    2 ++
 Source/cmGlobalUnixMakefileGenerator3.h   |    3 +++
 Source/cmGlobalWatcomWMakeGenerator.h     |    2 ++
 Source/cmLocalUnixMakefileGenerator3.cxx  |   13 +++++++++----
 4 files changed, 16 insertions(+), 4 deletions(-)


hooks/post-receive
-- 
CMake