Solve a few bugs generated in the previous commit

Author: weslleyspereira

CBLAS/CMakeLists.txt

@@ -4,12 +4,17 @@ enable_language(C)
 set(LAPACK_INSTALL_EXPORT_NAME ${CBLASLIB}-targets)
 
 # Create a header file cblas.h for the routines called in my C programs
-include(FortranCInterface)
-## Ensure that the fortran compiler and c compiler specified are compatible
-FortranCInterface_VERIFY()
-FortranCInterface_HEADER(${LAPACK_BINARY_DIR}/include/cblas_mangling.h
-                         MACRO_NAMESPACE "F77_"
-                         SYMBOL_NAMESPACE "F77_")
+include(CheckLanguage)
+check_language(Fortran)
+if(CMAKE_Fortran_COMPILER)
+  enable_language(Fortran)
+  include(FortranCInterface)
+  ## Ensure that the fortran compiler and c compiler specified are compatible
+  FortranCInterface_VERIFY()
+  FortranCInterface_HEADER(${LAPACK_BINARY_DIR}/include/cblas_mangling.h
+                          MACRO_NAMESPACE "F77_"
+                          SYMBOL_NAMESPACE "F77_")
+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

CMakeLists.txt

@@ -368,7 +368,15 @@ endif()
 set(LAPACK_INSTALL_EXPORT_NAME ${LAPACK_INSTALL_EXPORT_NAME_CACHE})
 unset(LAPACK_INSTALL_EXPORT_NAME_CACHE)
 
-add_subdirectory(LAPACKE)
+
+#-------------------------------------
+# LAPACKE
+# Include lapack.h and lapacke_mangling.h even if LAPACKE is not built
+add_subdirectory(LAPACKE/include)
+
+if(LAPACKE)
+  add_subdirectory(LAPACKE)
+endif()
 
 
 #-------------------------------------

LAPACKE/CMakeLists.txt

@@ -1,27 +1,8 @@
-# Create a header file lapacke_mangling.h for the routines called in my C programs
-include(FortranCInterface)
-## Ensure that the fortran compiler and c compiler specified are compatible
-FortranCInterface_VERIFY()
-FortranCInterface_HEADER(${LAPACK_BINARY_DIR}/include/lapacke_mangling.h
-  MACRO_NAMESPACE "LAPACK_"
-  SYMBOL_NAMESPACE "LAPACK_")
-if(NOT FortranCInterface_GLOBAL_FOUND OR NOT FortranCInterface_MODULE_FOUND)
-  message(WARNING "Reverting to pre-defined include/lapacke_mangling.h")
-  configure_file(include/lapacke_mangling_with_flags.h.in
-                 ${LAPACK_BINARY_DIR}/include/lapacke_mangling.h)
-endif()
-
-add_subdirectory(include)
-
-
-if(NOT LAPACKE)
-    return()
-endif()
-
-
 message(STATUS "LAPACKE enabled")
 enable_language(C)
 
+add_subdirectory(include)
+
 set(LAPACK_INSTALL_EXPORT_NAME ${LAPACKELIB}-targets)
 
 include_directories(include ${LAPACK_BINARY_DIR}/include)

LAPACKE/include/CMakeLists.txt

@@ -1,7 +1,26 @@
 set(LAPACKE_INCLUDE lapack.h)
-
 IF(LAPACKE)
     list(APPEND LAPACKE_INCLUDE lapacke.h lapacke_config.h lapacke_utils.h)
 endif()
 
 file(COPY ${LAPACKE_INCLUDE} DESTINATION ${LAPACK_BINARY_DIR}/include)
+
+# Create a header file lapacke_mangling.h for the routines called in my C programs
+include(CheckLanguage)
+check_language(Fortran)
+check_language(C)
+if(CMAKE_Fortran_COMPILER AND CMAKE_C_COMPILER)
+  enable_language(Fortran)
+  enable_language(C)
+  include(FortranCInterface)
+  ## Ensure that the fortran compiler and c compiler specified are compatible
+  FortranCInterface_VERIFY()
+  FortranCInterface_HEADER(${LAPACK_BINARY_DIR}/include/lapacke_mangling.h
+    MACRO_NAMESPACE "LAPACK_"
+    SYMBOL_NAMESPACE "LAPACK_")
+endif()
+if(NOT FortranCInterface_GLOBAL_FOUND OR NOT FortranCInterface_MODULE_FOUND)
+  message(WARNING "Reverting to pre-defined include/lapacke_mangling.h")
+  configure_file(lapacke_mangling_with_flags.h.in
+                 ${LAPACK_BINARY_DIR}/include/lapacke_mangling.h)
+endif()