[Cmake-commits] CMake branch, next, updated. v3.0.2-5393-ge8ae79e

[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  e8ae79ef2e865978910400dcdb3f6024fe62747f (commit)
       via  6120fca8e229da08fae1d58017962491fb6e03f3 (commit)
      from  f7829f46855d14b86fc74fb2988b4cb386ab2428 (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=e8ae79ef2e865978910400dcdb3f6024fe62747f
commit e8ae79ef2e865978910400dcdb3f6024fe62747f
Merge: f7829f4 6120fca
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Sep 22 08:56:53 2014 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Sep 22 08:56:53 2014 -0400

    Merge topic 'ninja-compiler-change' into next
    
    6120fca8 Ninja: Prevent compilers to be silently modified


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=6120fca8e229da08fae1d58017962491fb6e03f3
commit 6120fca8e229da08fae1d58017962491fb6e03f3
Author:     Sylvain Joubert <joubert.sy at gmail.com>
AuthorDate: Sat Sep 20 22:37:52 2014 +0200
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Mon Sep 22 08:44:39 2014 -0400

    Ninja: Prevent compilers to be silently modified
    
    Unlike with Unix Makefiles generator modifying compiler paths was not
    protected with Ninja generator.  It was possible to modify them in the
    cache without the expected effect on the generated solution.  Also
    activate corresponding tests with Ninja.

diff --git a/Source/cmGlobalNinjaGenerator.cxx b/Source/cmGlobalNinjaGenerator.cxx
index 09ee128..50e1abb 100644
--- a/Source/cmGlobalNinjaGenerator.cxx
+++ b/Source/cmGlobalNinjaGenerator.cxx
@@ -540,6 +540,15 @@ void cmGlobalNinjaGenerator
     cmSystemTools::Error("The Ninja generator does not support Fortran yet.");
     }
   this->cmGlobalGenerator::EnableLanguage(langs, makefile, optional);
+  for(std::vector<std::string>::const_iterator l = langs.begin();
+      l != langs.end(); ++l)
+    {
+    if(*l == "NONE")
+      {
+      continue;
+      }
+    this->ResolveLanguageCompiler(*l, makefile, optional);
+    }
 }
 
 bool cmGlobalNinjaGenerator::UsingMinGW = false;
diff --git a/Tests/RunCMake/CMakeLists.txt b/Tests/RunCMake/CMakeLists.txt
index 549aed8..fd3bb03 100644
--- a/Tests/RunCMake/CMakeLists.txt
+++ b/Tests/RunCMake/CMakeLists.txt
@@ -50,7 +50,7 @@ add_RunCMake_test(CMP0051)
 add_RunCMake_test(CMP0053)
 add_RunCMake_test(CMP0054)
 add_RunCMake_test(CTest)
-if(UNIX AND "${CMAKE_GENERATOR}" MATCHES "Unix Makefiles")
+if(UNIX AND "${CMAKE_GENERATOR}" MATCHES "Unix Makefiles|Ninja")
   add_RunCMake_test(CompilerChange)
 endif()
 add_RunCMake_test(CompilerNotFound)

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

Summary of changes:
 Source/cmGlobalNinjaGenerator.cxx |    9 +++++++++
 Tests/RunCMake/CMakeLists.txt     |    2 +-
 2 files changed, 10 insertions(+), 1 deletion(-)


hooks/post-receive
-- 
CMake