[Cmake-commits] CMake branch, next, updated. v2.8.6-2225-g9480e7e

[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  9480e7ebb160853e21f794f5b7aeee79deb7dfbc (commit)
       via  fcb2a27982bf8648c3aa3de58a4d54c7d700f580 (commit)
      from  eb7d0a8a458be161d7c57c02cdd8653a7c4a4019 (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=9480e7ebb160853e21f794f5b7aeee79deb7dfbc
commit 9480e7ebb160853e21f794f5b7aeee79deb7dfbc
Merge: eb7d0a8 fcb2a27
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Dec 15 09:37:59 2011 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Dec 15 09:37:59 2011 -0500

    Merge topic 'test-Fortran-compiler-compat' into next
    
    fcb2a27 Fix and simplify Fortran test compiler compatibility check


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=fcb2a27982bf8648c3aa3de58a4d54c7d700f580
commit fcb2a27982bf8648c3aa3de58a4d54c7d700f580
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Dec 15 09:20:28 2011 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Thu Dec 15 09:25:49 2011 -0500

    Fix and simplify Fortran test compiler compatibility check
    
    Since commit 38aab379 (Set CMAKE_<lang>_COMPILER_ID for VS generators,
    2011-09-02) the VS IDE generators set the C and C++ compiler id to MSVC
    and the Fortran compiler id to Intel.  This caused the Fortran test to
    fail compatible compiler detection because the if() test
    
      "${CMAKE_C_COMPILER_ID}" MATCHES "MSVC"
    
    is evaluated as the "var MATCHES regex" signature which evaluates the
    compiler id "MSVC" as a variable which is defined to 1 which does not
    match "MSVC".
    
    Combine tests for non-identical but compatible compiler vendors into a
    single regex match whose left hand side will not be defined as a
    variable.

diff --git a/Tests/Fortran/CMakeLists.txt b/Tests/Fortran/CMakeLists.txt
index ba0bdcc..a995f68 100644
--- a/Tests/Fortran/CMakeLists.txt
+++ b/Tests/Fortran/CMakeLists.txt
@@ -113,16 +113,8 @@ endfunction()
 
 # if the id's match or the compilers are compatible, then
 # call the test_fortran_c_interface_module function
-if(("${CMAKE_Fortran_COMPILER_ID}" MATCHES "Intel")
-    AND 
-    ("${CMAKE_C_COMPILER_ID}" MATCHES "MSVC")
-    )
-  set(COMPATABLE_COMPILERS TRUE)
-endif()
-if("${CMAKE_Fortran_COMPILER_ID}:${CMAKE_C_COMPILER_ID}" MATCHES "Absoft:GNU")
-  set(COMPATABLE_COMPILERS TRUE)
-endif()
-if(COMPATABLE_COMPILERS
+if("${CMAKE_Fortran_COMPILER_ID}:${CMAKE_C_COMPILER_ID}" MATCHES
+    "(Intel:MSVC|Absoft:GNU)"
     OR ("${CMAKE_Fortran_COMPILER_ID}" MATCHES "${CMAKE_C_COMPILER_ID}" ))
   test_fortran_c_interface_module()
 else()

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

Summary of changes:
 Tests/Fortran/CMakeLists.txt |   12 ++----------
 1 files changed, 2 insertions(+), 10 deletions(-)


hooks/post-receive
-- 
CMake