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 ee1a481cf097d78e547e4af821767b3347c443d8 (commit)
via d31d7ffd1e59c9fe2a108726d2d9d78adf90ca11 (commit)
via 5ee00b71e94f5daa985b8453ae67b125ea0983d9 (commit)
from 405dcbb37c9a442a92d5df52f6f6ecf387cd7cb7 (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 -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=ee1a481cf097d78e547e4af821767b3347c443d8
commit ee1a481cf097d78e547e4af821767b3347c443d8
Merge: 405dcbb d31d7ff
Author: Brad King <brad.k...@kitware.com>
AuthorDate: Fri Feb 5 10:53:47 2016 -0500
Commit: CMake Topic Stage <kwro...@kitware.com>
CommitDate: Fri Feb 5 10:53:47 2016 -0500
Merge topic 'test-FortranCInterface-again' into next
d31d7ffd Tests: Fix Fortran test to run FortranCInterface again
5ee00b71 CMake Nightly Date Stamp
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=d31d7ffd1e59c9fe2a108726d2d9d78adf90ca11
commit d31d7ffd1e59c9fe2a108726d2d9d78adf90ca11
Author: Brad King <brad.k...@kitware.com>
AuthorDate: Fri Feb 5 10:48:20 2016 -0500
Commit: Brad King <brad.k...@kitware.com>
CommitDate: Fri Feb 5 10:49:08 2016 -0500
Tests: Fix Fortran test to run FortranCInterface again
Updates to Tests/Fortran by commit v3.2.0-rc1~501^2 (Avoid if() quoted
auto-dereference, 2014-10-14) changed our check
"${CMAKE_Fortran_COMPILER_ID}" MATCHES "${CMAKE_C_COMPILER_ID}"
to
CMAKE_Fortran_COMPILER_ID MATCHES CMAKE_C_COMPILER_ID
because CMP0054 warned about the LHS compiler id "MSVC" being expanded.
However, the RHS of if(MATCHES) does not auto-dereference so this check
has returned FALSE since then and the FortranCInterface part of the test
has not been running!
Fix this by using STREQUAL with quoted arguments and setting CMP0054 to
NEW (by requiring 3.1).
diff --git a/Tests/Fortran/CMakeLists.txt b/Tests/Fortran/CMakeLists.txt
index 753ce27..51e971b 100644
--- a/Tests/Fortran/CMakeLists.txt
+++ b/Tests/Fortran/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required (VERSION 3.0)
+cmake_minimum_required (VERSION 3.1)
project(testf C CXX Fortran)
if(NOT DEFINED CMake_TEST_NESTED_MAKE_PROGRAM AND NOT CMAKE_GENERATOR MATCHES
"Visual Studio")
set(CMake_TEST_NESTED_MAKE_PROGRAM "${CMAKE_MAKE_PROGRAM}")
@@ -119,7 +119,7 @@ endfunction()
# call the test_fortran_c_interface_module function
if("${CMAKE_Fortran_COMPILER_ID}:${CMAKE_C_COMPILER_ID}" MATCHES
"(Intel:MSVC|Absoft:GNU)"
- OR (CMAKE_Fortran_COMPILER_ID MATCHES CMAKE_C_COMPILER_ID ))
+ OR ("${CMAKE_Fortran_COMPILER_ID}" STREQUAL "${CMAKE_C_COMPILER_ID}" ))
test_fortran_c_interface_module()
else()
message("Fortran does not match c compiler")
-----------------------------------------------------------------------
Summary of changes:
Source/CMakeVersion.cmake | 2 +-
Tests/Fortran/CMakeLists.txt | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
hooks/post-receive
--
CMake
_______________________________________________
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/mailman/listinfo/cmake-commits
