[Cmake-commits] CMake branch, next, updated. v2.8.12.2-1835-ge996c49

[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  e996c49106589dc090a399b382cc3b034e146141 (commit)
       via  4f8af97912107a298cca3048aa16ec2fce5becad (commit)
       via  ad28436798c68e0853e402b07d20eab5c496ac96 (commit)
      from  28898157851e68f13dc4267164c1815d0a28bab8 (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=e996c49106589dc090a399b382cc3b034e146141
commit e996c49106589dc090a399b382cc3b034e146141
Merge: 2889815 4f8af97
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Fri Feb 28 08:57:18 2014 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Feb 28 08:57:18 2014 -0500

    Merge topic 'tests-alternative-generator' into next
    
    4f8af979 Revert "Tests: Pass the CTEST_MAKE_PROGRAM to the ExportImport test."
    ad284367 Revert "Tests: Don't run fortran tests when using Ninja."


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=4f8af97912107a298cca3048aa16ec2fce5becad
commit 4f8af97912107a298cca3048aa16ec2fce5becad
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Fri Feb 28 14:56:51 2014 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Fri Feb 28 14:56:51 2014 +0100

    Revert "Tests: Pass the CTEST_MAKE_PROGRAM to the ExportImport test."
    
    This reverts commit 47cee699ccad40cd861fdb213fc9908091b6849a.

diff --git a/Tests/ExportImport/CMakeLists.txt b/Tests/ExportImport/CMakeLists.txt
index 77528aa..02a0371 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 -DCMAKE_MAKE_PROGRAM=${CMAKE_TEST_MAKEPROGRAM}
+    --build-options -C${ExportImport_BINARY_DIR}/InitialCache.cmake
   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 -DCMAKE_MAKE_PROGRAM=${CMAKE_TEST_MAKEPROGRAM}
+   --build-options -C${ExportImport_BINARY_DIR}/InitialCache.cmake
   VERBATIM
   )
 add_custom_target(ImportTarget ALL DEPENDS ${ExportImport_BINARY_DIR}/ImportProject)

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=ad28436798c68e0853e402b07d20eab5c496ac96
commit ad28436798c68e0853e402b07d20eab5c496ac96
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Fri Feb 28 14:56:48 2014 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Fri Feb 28 14:56:48 2014 +0100

    Revert "Tests: Don't run fortran tests when using Ninja."
    
    This reverts commit 5c75f99533d9e00197c63e7fa348cf921c49c825.

diff --git a/Tests/CheckFortran.cmake b/Tests/CheckFortran.cmake
index 79db360..ebbb426 100644
--- a/Tests/CheckFortran.cmake
+++ b/Tests/CheckFortran.cmake
@@ -12,12 +12,6 @@
 # (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})

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

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


hooks/post-receive
-- 
CMake