[Cmake-commits] CMake branch, next, updated. v2.8.12.2-1825-ga3ff0e7

[Stephen Kelly]

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  a3ff0e7b0cc739a5308f7a0e4ebeea78e9e4fc6b (commit)
       via  5c75f99533d9e00197c63e7fa348cf921c49c825 (commit)
       via  47cee699ccad40cd861fdb213fc9908091b6849a (commit)
      from  ffa09c3fc70a23dcde02dafbca1ceb44b691a60a (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=a3ff0e7b0cc739a5308f7a0e4ebeea78e9e4fc6b
commit a3ff0e7b0cc739a5308f7a0e4ebeea78e9e4fc6b
Merge: ffa09c3 5c75f99
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Thu Feb 27 16:31:09 2014 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Feb 27 16:31:09 2014 -0500

    Merge topic 'tests-alternative-generator' into next
    
    5c75f995 Tests: Don't run fortran tests when using Ninja.
    47cee699 Tests: Pass the CTEST_MAKE_PROGRAM to the ExportImport test.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=5c75f99533d9e00197c63e7fa348cf921c49c825
commit 5c75f99533d9e00197c63e7fa348cf921c49c825
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Thu Feb 27 17:10:45 2014 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Thu Feb 27 17:12:43 2014 +0100

    Tests: Don't run fortran tests when using Ninja.

diff --git a/Tests/CheckFortran.cmake b/Tests/CheckFortran.cmake
index ebbb426..79db360 100644
--- a/Tests/CheckFortran.cmake
+++ b/Tests/CheckFortran.cmake
@@ -12,6 +12,12 @@
 # (To distribute this file outside of CMake, substitute the full
 #  License text for the above reference.)
 
+if (CMAKE_TEST_GENERATOR STREQUAL Ninja)
+  # Ninja generator does not support Fortran.
+  unset(CMAKE_Fortran_COMPILER CACHE)
+  return()
+endif()
+
 if(NOT DEFINED CMAKE_Fortran_COMPILER)
   set(_desc "Looking for a Fortran compiler")
   message(STATUS ${_desc})

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=47cee699ccad40cd861fdb213fc9908091b6849a
commit 47cee699ccad40cd861fdb213fc9908091b6849a
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Thu Feb 27 17:05:41 2014 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Thu Feb 27 17:05:41 2014 +0100

    Tests: Pass the CTEST_MAKE_PROGRAM to the ExportImport test.

diff --git a/Tests/ExportImport/CMakeLists.txt b/Tests/ExportImport/CMakeLists.txt
index 02a0371..77528aa 100644
--- a/Tests/ExportImport/CMakeLists.txt
+++ b/Tests/ExportImport/CMakeLists.txt
@@ -45,7 +45,7 @@ add_custom_command(
     --build-target install
     --build-generator ${CMAKE_GENERATOR}
     --build-generator-toolset "${CMAKE_GENERATOR_TOOLSET}"
-    --build-options -C${ExportImport_BINARY_DIR}/InitialCache.cmake
+    --build-options -C${ExportImport_BINARY_DIR}/InitialCache.cmake -DCMAKE_MAKE_PROGRAM=${CMAKE_TEST_MAKEPROGRAM}
   VERBATIM
   )
 add_custom_target(ExportTarget ALL DEPENDS ${ExportImport_BINARY_DIR}/ExportProject)
@@ -66,7 +66,7 @@ add_custom_command(
    --build-project Import
    --build-generator ${CMAKE_GENERATOR}
    --build-generator-toolset "${CMAKE_GENERATOR_TOOLSET}"
-   --build-options -C${ExportImport_BINARY_DIR}/InitialCache.cmake
+   --build-options -C${ExportImport_BINARY_DIR}/InitialCache.cmake -DCMAKE_MAKE_PROGRAM=${CMAKE_TEST_MAKEPROGRAM}
   VERBATIM
   )
 add_custom_target(ImportTarget ALL DEPENDS ${ExportImport_BINARY_DIR}/ImportProject)

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

Summary of changes:
 Tests/CheckFortran.cmake          |    6 ++++++
 Tests/ExportImport/CMakeLists.txt |    4 ++--
 2 files changed, 8 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
CMake