From 14422decc2583e556352408983f4f8fda3054c70 Mon Sep 17 00:00:00 2001 From: Gael Guennebaud Date: Thu, 13 Feb 2014 09:21:13 +0100 Subject: Fix Fortran compiler detection --- blas/CMakeLists.txt | 3 +++ cmake/language_support.cmake | 2 +- lapack/CMakeLists.txt | 3 +++ 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/blas/CMakeLists.txt b/blas/CMakeLists.txt index c35a2fdbe..a9bc05137 100644 --- a/blas/CMakeLists.txt +++ b/blas/CMakeLists.txt @@ -7,6 +7,9 @@ workaround_9220(Fortran EIGEN_Fortran_COMPILER_WORKS) if(EIGEN_Fortran_COMPILER_WORKS) enable_language(Fortran OPTIONAL) + if(NOT CMAKE_Fortran_COMPILER) + set(EIGEN_Fortran_COMPILER_WORKS OFF) + endif() endif() add_custom_target(blas) diff --git a/cmake/language_support.cmake b/cmake/language_support.cmake index 2ca303c92..d687b71f6 100644 --- a/cmake/language_support.cmake +++ b/cmake/language_support.cmake @@ -23,7 +23,7 @@ function(workaround_9220 language language_works) #message("DEBUG: language = ${language}") set(text "project(test NONE) - cmake_minimum_required(VERSION 2.6.0) + cmake_minimum_required(VERSION 2.8.0) set (CMAKE_Fortran_FLAGS \"${CMAKE_Fortran_FLAGS}\") set (CMAKE_EXE_LINKER_FLAGS \"${CMAKE_EXE_LINKER_FLAGS}\") enable_language(${language} OPTIONAL) diff --git a/lapack/CMakeLists.txt b/lapack/CMakeLists.txt index 7e7444326..9883d4c72 100644 --- a/lapack/CMakeLists.txt +++ b/lapack/CMakeLists.txt @@ -7,6 +7,9 @@ workaround_9220(Fortran EIGEN_Fortran_COMPILER_WORKS) if(EIGEN_Fortran_COMPILER_WORKS) enable_language(Fortran OPTIONAL) + if(NOT CMAKE_Fortran_COMPILER) + set(EIGEN_Fortran_COMPILER_WORKS OFF) + endif() endif() add_custom_target(lapack) -- cgit v1.2.3