Browse Source

Ninja: the Ninja generator does not support Fortran yet.

Peter Kümmel 12 years ago
parent
commit
2271ca3496
1 changed files with 11 additions and 5 deletions
  1. 11 5
      Source/cmGlobalNinjaGenerator.cxx

+ 11 - 5
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;