Only enable Fortran for CBLAS if Fortran compiler is found

Author: ACSimon33

CBLAS/CMakeLists.txt

@@ -1,10 +1,15 @@
 message(STATUS "CBLAS enabled")
 enable_language(C)
-enable_language(Fortran)
 
-# Check for any necessary platform specific compiler flags
-include(CheckLAPACKCompilerFlags)
-CheckLAPACKCompilerFlags()
+include(CheckLanguage)
+check_language(Fortran)
+if(CMAKE_Fortran_COMPILER)
+  enable_language(Fortran)
+
+  # Check for any necessary platform specific compiler flags
+  include(CheckLAPACKCompilerFlags)
+  CheckLAPACKCompilerFlags()
+endif()
 
 set(LAPACK_INSTALL_EXPORT_NAME ${CBLASLIB}-targets)
 

CBLAS/include/CMakeLists.txt

@@ -42,7 +42,7 @@ endif()
 if(NOT FortranCInterface_GLOBAL_FOUND OR NOT FortranCInterface_MODULE_FOUND)
   message(WARNING "Reverting to pre-defined include/cblas_mangling.h")
     configure_file(
-      include/cblas_mangling_with_flags.h.in
+      cblas_mangling_with_flags.h.in
       ${LAPACK_BINARY_DIR}/include/cblas_mangling.h)
 endif()
 

CMakeLists.txt

@@ -249,9 +249,6 @@ if(NOT BLAS_FOUND)
   message(STATUS "Using supplied NETLIB BLAS implementation")
   add_subdirectory(BLAS)
   set(BLAS_LIBRARIES ${BLASLIB})
-
-  # Include cblas_f77.h and cblas_mangling.h even if CBLAS is not built
-  add_subdirectory(CBLAS/include)
 else()
   add_link_options(${BLAS_LINKER_FLAGS})
 endif()
@@ -261,6 +258,11 @@ endif()
 # CBLAS
 option(CBLAS "Build CBLAS" OFF)
 
+# Include cblas_f77.h and cblas_mangling.h even if CBLAS is not built
+if(CBLAS OR NOT BLAS_FOUND)
+  add_subdirectory(CBLAS/include)
+endif()
+
 if(CBLAS)
   add_subdirectory(CBLAS)
 endif()
@@ -288,7 +290,7 @@ if(LAPACK_LIBRARIES)
   check_language(Fortran)
   if(CMAKE_Fortran_COMPILER)
     enable_language(Fortran)
-    include(CheckFortranFunctionExists)
+    incldude(CheckFortranFunctionExists)
     set(CMAKE_REQUIRED_LIBRARIES ${LAPACK_LIBRARIES})
     # Check if new routine of 3.4.0 is in LAPACK_LIBRARIES
     CHECK_FORTRAN_FUNCTION_EXISTS("dgeqrt" LATESTLAPACK_FOUND)