Changed fortran compiler name to be uppercase and stripped of path/ext.

diff --git a/cmake/arch.cmake b/cmake/arch.cmake
index 5848c24..34beb71 100644 (file)
--- a/cmake/arch.cmake
+++ b/cmake/arch.cmake
@@ -12,7 +12,7 @@ if (${ARCH} STREQUAL "x86" OR ${ARCH} STREQUAL "x86_64")
   endif ()\r
 \r
   if (NOT NO_EXPRECISION)\r
-    if (${CMAKE_Fortran_COMPILER} MATCHES "gfortran.*")\r
+    if (${F_COMPILER} MATCHES "GFORTRAN")\r
       # N.B. I'm not sure if CMake differentiates between GCC and LSB -hpa\r
       if (${CMAKE_C_COMPILER} STREQUAL "GNU" OR ${CMAKE_C_COMPILER} STREQUAL "LSB")\r
         set(EXPRECISION        1)\r
@@ -86,7 +86,7 @@ if (${ARCH} STREQUAL "ia64")
   set(NO_BINARY_MODE 1)\r
   set(BINARY_DEFINED 1)\r
 \r
-  if (${CMAKE_Fortran_COMPILER} MATCHES "gfortran.*")\r
+  if (${F_COMPILER} MATCHES "GFORTRAN")\r
     if (${CMAKE_C_COMPILER} STREQUAL "GNU")\r
       # EXPRECISION    = 1\r
       # CCOMMON_OPT    += -DEXPRECISION\r

diff --git a/cmake/f_check.cmake b/cmake/f_check.cmake
index 6c1dbdf..5355208 100644 (file)
--- a/cmake/f_check.cmake
+++ b/cmake/f_check.cmake
@@ -48,3 +48,7 @@ else ()
     "#define BUNDERSCORE _\n"
     "#define NEEDBUNDERSCORE 1\n")
 endif()
+
+get_filename_component(F_COMPILER ${CMAKE_Fortran_COMPILER} NAME_WE)
+string(TOUPPER ${F_COMPILER} F_COMPILER)
+

diff --git a/cmake/fc.cmake b/cmake/fc.cmake
index 61f0e01..d721586 100644 (file)
--- a/cmake/fc.cmake
+++ b/cmake/fc.cmake
@@ -3,7 +3,7 @@
 ## Description: Ported from portion of OpenBLAS/Makefile.system\r
 ##              Sets Fortran related variables.\r
 \r
-if (${CMAKE_Fortran_COMPILER} STREQUAL "G77")\r
+if (${F_COMPILER} STREQUAL "G77")\r
   set(CCOMMON_OPT "${CCOMMON_OPT} -DF_INTERFACE_G77")\r
   set(FCOMMON_OPT "${FCOMMON_OPT} -Wall")\r
   if (NOT NO_BINARY_MODE)\r
@@ -15,7 +15,7 @@ if (${CMAKE_Fortran_COMPILER} STREQUAL "G77")
   endif ()\r
 endif ()\r
 \r
-if (${CMAKE_Fortran_COMPILER} STREQUAL "G95")\r
+if (${F_COMPILER} STREQUAL "G95")\r
   set(CCOMMON_OPT "${CCOMMON_OPT} -DF_INTERFACE_G95")\r
   set(FCOMMON_OPT "${FCOMMON_OPT} -Wall")\r
   if (NOT NO_BINARY_MODE)\r
@@ -27,7 +27,7 @@ if (${CMAKE_Fortran_COMPILER} STREQUAL "G95")
   endif ()\r
 endif ()\r
 \r
-if (${CMAKE_Fortran_COMPILER} STREQUAL "GFORTRAN")\r
+if (${F_COMPILER} STREQUAL "GFORTRAN")\r
   set(CCOMMON_OPT "${CCOMMON_OPT} -DF_INTERFACE_GFORT")\r
   set(FCOMMON_OPT "${FCOMMON_OPT} -Wall")\r
   #Don't include -lgfortran, when NO_LAPACK=1 or lsbcc\r
@@ -58,7 +58,7 @@ if (${CMAKE_Fortran_COMPILER} STREQUAL "GFORTRAN")
   endif ()\r
 endif ()\r
 \r
-if (${CMAKE_Fortran_COMPILER} STREQUAL "INTEL")\r
+if (${F_COMPILER} STREQUAL "INTEL")\r
   set(CCOMMON_OPT "${CCOMMON_OPT} -DF_INTERFACE_INTEL")\r
   if (INTERFACE64)\r
     set(FCOMMON_OPT "${FCOMMON_OPT} -i8")\r
@@ -68,14 +68,14 @@ if (${CMAKE_Fortran_COMPILER} STREQUAL "INTEL")
   endif ()\r
 endif ()\r
 \r
-if (${CMAKE_Fortran_COMPILER} STREQUAL "FUJITSU")\r
+if (${F_COMPILER} STREQUAL "FUJITSU")\r
   set(CCOMMON_OPT "${CCOMMON_OPT} -DF_INTERFACE_FUJITSU")\r
   if (USE_OPENMP)\r
     set(FCOMMON_OPT "${FCOMMON_OPT} -openmp")\r
   endif ()\r
 endif ()\r
 \r
-if (${CMAKE_Fortran_COMPILER} STREQUAL "IBM")\r
+if (${F_COMPILER} STREQUAL "IBM")\r
   set(CCOMMON_OPT "${CCOMMON_OPT} -DF_INTERFACE_IBM")\r
   # FCOMMON_OPT        += -qarch=440\r
   if (BINARY64)\r
@@ -91,7 +91,7 @@ if (${CMAKE_Fortran_COMPILER} STREQUAL "IBM")
   endif ()\r
 endif ()\r
 \r
-if (${CMAKE_Fortran_COMPILER} STREQUAL "PGI")\r
+if (${F_COMPILER} STREQUAL "PGI")\r
   set(CCOMMON_OPT "${CCOMMON_OPT} -DF_INTERFACE_PGI")\r
   set(COMMON_PROF "${COMMON_PROF} -DPGICOMPILER")\r
   if (BINARY64)\r
@@ -107,7 +107,7 @@ if (${CMAKE_Fortran_COMPILER} STREQUAL "PGI")
   endif ()\r
 endif ()\r
 \r
-if (${CMAKE_Fortran_COMPILER} STREQUAL "PATHSCALE")\r
+if (${F_COMPILER} STREQUAL "PATHSCALE")\r
   set(CCOMMON_OPT "${CCOMMON_OPT} -DF_INTERFACE_PATHSCALE")\r
   if (BINARY64)\r
     if (INTERFACE64)\r
@@ -134,7 +134,7 @@ if (${CMAKE_Fortran_COMPILER} STREQUAL "PATHSCALE")
   endif ()\r
 endif ()\r
 \r
-if (${CMAKE_Fortran_COMPILER} STREQUAL "OPEN64")\r
+if (${F_COMPILER} STREQUAL "OPEN64")\r
 \r
   set(CCOMMON_OPT "${CCOMMON_OPT} -DF_INTERFACE_OPEN64")\r
   if (BINARY64)\r
@@ -172,7 +172,7 @@ if (${CMAKE_Fortran_COMPILER} STREQUAL "OPEN64")
   endif ()\r
 endif ()\r
 \r
-if (${CMAKE_Fortran_COMPILER} STREQUAL "SUN")\r
+if (${F_COMPILER} STREQUAL "SUN")\r
   set(CCOMMON_OPT "${CCOMMON_OPT} -DF_INTERFACE_SUN")\r
   if (${ARCH} STREQUAL "x86")\r
     set(FCOMMON_OPT "${FCOMMON_OPT} -m32")\r
@@ -184,7 +184,7 @@ if (${CMAKE_Fortran_COMPILER} STREQUAL "SUN")
   endif ()\r
 endif ()\r
 \r
-if (${CMAKE_Fortran_COMPILER} STREQUAL "COMPAQ")\r
+if (${F_COMPILER} STREQUAL "COMPAQ")\r
   set(CCOMMON_OPT "${CCOMMON_OPT} -DF_INTERFACE_COMPAQ")\r
   if (USE_OPENMP)\r
     set(FCOMMON_OPT "${FCOMMON_OPT} -openmp")\r

diff --git a/cmake/system.cmake b/cmake/system.cmake
index f85d13f..1f602e0 100644 (file)
--- a/cmake/system.cmake
+++ b/cmake/system.cmake
@@ -72,7 +72,7 @@ if (CMAKE_CXX_COMPILER STREQUAL loongcc)
 endif ()
 
 #if don't use Fortran, it will only compile CBLAS.
-if (${ONLY_CBLAS})
+if (ONLY_CBLAS)
   set(NO_LAPACK 1)
 else ()
   set(ONLY_CBLAS 0)
@@ -81,12 +81,10 @@ endif ()
 include("${CMAKE_SOURCE_DIR}/cmake/prebuild.cmake")
 
 if (NOT DEFINED NUM_THREADS)
-  # TODO: NUM_CORES comes from `getarch.c` or `cpuid_x86.c`. This is built and executed above in `Makefile.prebuild`, and the results are in `Makefile.conf` and `Makefile_kernel.conf`. -hpa
   set(NUM_THREADS ${NUM_CORES})
 endif ()
 
 if (${NUM_THREADS} EQUAL 1)
-  # TODO: was "override USE_THREAD = 0", do we need "override" here? -hpa
   set(USE_THREAD 0)
 endif ()
 
@@ -150,7 +148,7 @@ if (NEED_PIC)
     set(CCOMMON_OPT "${CCOMMON_OPT} -fPIC")
   endif ()
 
-  if (${CMAKE_Fortran_COMPILER} STREQUAL "SUN")
+  if (${F_COMPILER} STREQUAL "SUN")
     set(FCOMMON_OPT "${FCOMMON_OPT} -pic")
   else ()
     set(FCOMMON_OPT "${FCOMMON_OPT} -fPIC")