summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Cole <david.cole@kitware.com>2011-12-16 10:15:32 -0500
committerCMake Topic Stage <kwrobot@kitware.com>2011-12-16 10:15:32 -0500
commit52d5f67ec7ac1f8c97a0aa51750b7496a25dcfa8 (patch)
tree621d0b5edf3602d1108b90844ab16495b6b9cc1a
parent44b6b0b5df98f0b0a9e2302abe41311379cb034c (diff)
parentfcb2a27982bf8648c3aa3de58a4d54c7d700f580 (diff)
downloadcmake-52d5f67ec7ac1f8c97a0aa51750b7496a25dcfa8.tar.gz
Merge topic 'test-Fortran-compiler-compat'
fcb2a27 Fix and simplify Fortran test compiler compatibility check
-rw-r--r--Tests/Fortran/CMakeLists.txt12
1 files changed, 2 insertions, 10 deletions
diff --git a/Tests/Fortran/CMakeLists.txt b/Tests/Fortran/CMakeLists.txt
index ba0bdcc78f..a995f68dd0 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()