From f047ca31114d5749386660d65b7166e82e82d058 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Markus=20M=C3=BCtzel?= Date: Sat, 5 Aug 2023 13:32:20 +0200 Subject: [PATCH] cmake: Check for Fortran compiler early on --- CMakeLists.txt | 11 +++++++++++ cmake/f_check.cmake | 7 +------ 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 35077f3c2..f3cb0eed4 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -93,6 +93,17 @@ endif() message(WARNING "CMake support is experimental. It does not yet support all build options and may not produce the same Makefiles that OpenBLAS ships with.") +if(NOT NOFORTRAN) + # Check for working Fortran compiler + include(CheckLanguage) + check_language(Fortran) + if(CMAKE_Fortran_COMPILER) + enable_language(Fortran) + else() + set(NOFORTRAN 1) + endif() +endif() + include("${PROJECT_SOURCE_DIR}/cmake/utils.cmake") include("${PROJECT_SOURCE_DIR}/cmake/system.cmake") diff --git a/cmake/f_check.cmake b/cmake/f_check.cmake index df3a4858d..df9716cb7 100644 --- a/cmake/f_check.cmake +++ b/cmake/f_check.cmake @@ -20,12 +20,7 @@ # NEEDBUNDERSCORE # NEED2UNDERSCORES -include(CheckLanguage) -check_language(Fortran) -if(CMAKE_Fortran_COMPILER) - enable_language(Fortran) -else() - set (NOFORTRAN 1) +if(NOT CMAKE_Fortran_COMPILER) if (NOT NO_LAPACK) if (NOT XXXXX) message(STATUS "No Fortran compiler found, can build only BLAS and f2c-converted LAPACK")