[Cmake-commits] CMake branch, next, updated. v2.8.10.2-2429-ga1f098a

[Peter Kuemmel]

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  a1f098ab47755fc94f90f1abceef7f4ffb2ffd87 (commit)
       via  2271ca34968b242d4777b5dcb4888b67a75a93a8 (commit)
      from  00dfd78db80fd6d2bac5c566dc1ec8dde4c5f409 (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=a1f098ab47755fc94f90f1abceef7f4ffb2ffd87
commit a1f098ab47755fc94f90f1abceef7f4ffb2ffd87
Merge: 00dfd78 2271ca3
Author:     Peter Kuemmel <syntheticpp at gmx.net>
AuthorDate: Sun Mar 10 06:40:34 2013 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Sun Mar 10 06:40:34 2013 -0400

    Merge topic 'ninja-mingw-lang' into next
    
    2271ca3 Ninja: the Ninja generator does not support Fortran yet.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=2271ca34968b242d4777b5dcb4888b67a75a93a8
commit 2271ca34968b242d4777b5dcb4888b67a75a93a8
Author:     Peter Kümmel <syntheticpp at gmx.net>
AuthorDate: Sun Mar 10 11:36:57 2013 +0100
Commit:     Peter Kümmel <syntheticpp at gmx.net>
CommitDate: Sun Mar 10 11:36:57 2013 +0100

    Ninja: the Ninja generator does not support Fortran yet.

diff --git a/Source/cmGlobalNinjaGenerator.cxx b/Source/cmGlobalNinjaGenerator.cxx
index a999847..01c685d 100644
--- a/Source/cmGlobalNinjaGenerator.cxx
+++ b/Source/cmGlobalNinjaGenerator.cxx
@@ -17,6 +17,8 @@
 #include "cmGeneratorTarget.h"
 #include "cmVersion.h"
 
+#include <algorithm>
+
 const char* cmGlobalNinjaGenerator::NINJA_BUILD_FILE = "build.ninja";
 const char* cmGlobalNinjaGenerator::NINJA_RULES_FILE = "rules.ninja";
 const char* cmGlobalNinjaGenerator::INDENT = "  ";
@@ -491,16 +493,20 @@ void cmGlobalNinjaGenerator::Generate()
 // Used in:
 //   Source/cmMakefile.cxx:
 void cmGlobalNinjaGenerator
-::EnableLanguage(std::vector<std::string>const& languages,
-                 cmMakefile *mf,
+::EnableLanguage(std::vector<std::string>const& langs,
+                 cmMakefile* makefile,
                  bool optional)
 {
-  if(mf->IsOn("CMAKE_COMPILER_IS_MINGW"))
+  if (makefile->IsOn("CMAKE_COMPILER_IS_MINGW"))
     {
     UsingMinGW = true;
-    this->EnableMinGWLanguage(mf);
+    this->EnableMinGWLanguage(makefile);
+    }
+  if (std::find(langs.begin(), langs.end(), "Fortran") != langs.end())
+    {
+    cmSystemTools::Error("The Ninja generator does not support Fortran yet.");
     }
-  this->cmGlobalGenerator::EnableLanguage(languages, mf, optional);
+  this->cmGlobalGenerator::EnableLanguage(langs, makefile, optional);
 }
 
 bool cmGlobalNinjaGenerator::UsingMinGW = false;

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

Summary of changes:
 Source/cmGlobalNinjaGenerator.cxx |   16 +++++++++++-----
 1 files changed, 11 insertions(+), 5 deletions(-)


hooks/post-receive
-- 
CMake