summaryrefslogtreecommitdiffstats
path: root/Tests/Fortran
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2016-02-08 15:33:07 (GMT)
committerCMake Topic Stage <kwrobot@kitware.com>2016-02-08 15:33:07 (GMT)
commitbd15330da1edaf4a662335ff53648074fdc30e2b (patch)
tree56aeb04ae34cd582f4af6cddd0282527ef287044 /Tests/Fortran
parenta7e2021fea7f5dee0c8d8c6841819286438c8580 (diff)
parentd31d7ffd1e59c9fe2a108726d2d9d78adf90ca11 (diff)
downloadCMake-bd15330da1edaf4a662335ff53648074fdc30e2b.zip
CMake-bd15330da1edaf4a662335ff53648074fdc30e2b.tar.gz
CMake-bd15330da1edaf4a662335ff53648074fdc30e2b.tar.bz2
Merge topic 'test-FortranCInterface-again'
d31d7ffd Tests: Fix Fortran test to run FortranCInterface again
Diffstat (limited to 'Tests/Fortran')
-rw-r--r--Tests/Fortran/CMakeLists.txt4
1 files changed, 2 insertions, 2 deletions
diff --git a/Tests/Fortran/CMakeLists.txt b/Tests/Fortran/CMakeLists.txt
index ecf38a6..1268982 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")