Apply Sebastien Fabbro patch for the cmake build.

"Two more fixes for the cmake files of lapack-3.3.1:
1) syntax consistency for BLAS_LIBRARIES
2) link lapack with xblas when xblas is enabled"

diff --git a/CMakeLists.txt b/CMakeLists.txt
index fab9181827f59f3227d69bcf330a3eb85fd93e13..aea39b3a71aa93539c2f342e653b15f155d76188 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -67,25 +67,26 @@ set(PKG_CONFIG_DIR ${libdir}/pkgconfig)
 
 option(USE_OPTIMIZED_BLAS "Whether or not to use an optimized BLAS library instead of included netlib BLAS" OFF)
 
+
 # Check the usage of the user provided BLAS libraries
-if(BLAS_LIBRAIRIES)
+if(BLAS_LIBRARIES)
   include(CheckFortranFunctionExists)
-  set(CMAKE_REQUIRED_LIBRARIES ${BLAS_LIBRAIRIES})
+  set(CMAKE_REQUIRED_LIBRARIES ${BLAS_LIBRARIES})
   CHECK_FORTRAN_FUNCTION_EXISTS("dgemm" BLAS_FOUND)
   unset( CMAKE_REQUIRED_LIBRARIES )
   if(BLAS_FOUND)
-    message(STATUS "--> BLAS supplied by user is WORKING, will use ${BLAS_LIBRAIRIES}.")
+    message(STATUS "--> BLAS supplied by user is WORKING, will use ${BLAS_LIBRARIES}.")
   else(BLAS_FOUND)
-    message(ERROR "--> BLAS supplied by user is not WORKING, CANNOT USE ${BLAS_LIBRAIRIES}.")
+    message(ERROR "--> BLAS supplied by user is not WORKING, CANNOT USE ${BLAS_LIBRARIES}.")
     message(ERROR "-->     Will use REFERENCE BLAS (by default)")
-    message(ERROR "-->     Or Correct your BLAS_LIBRAIRIES entry ")
+    message(ERROR "-->     Or Correct your BLAS_LIBRARIES entry ")
     message(ERROR "-->     Or Consider checking USE_OPTIMIZED_BLAS")
   endif(BLAS_FOUND)
 
 # User did not provide a BLAS Library but specified to search for one
 elseif( USE_OPTIMIZED_BLAS )
   find_package( BLAS )
-endif (BLAS_LIBRAIRIES)
+endif (BLAS_LIBRARIES)
 
 # Neither user specified or optimized BLAS libraries can be used
 if(NOT BLAS_FOUND)
@@ -103,6 +104,11 @@ else()
     "${CMAKE_SHARED_LINKER_FLAGS} ${BLAS_LINKER_FLAGS}" 
     CACHE STRING "Linker flags for shared libs" FORCE)
 endif( NOT BLAS_FOUND )
+
+option(USE_XBLAS "Build extended precision (needs XBLAS)" OFF)
+if (USE_XBLAS)
+  find_library(XBLAS_LIBRARY NAMES xblas)
+endif(USE_XBLAS)
    
 add_subdirectory(SRC)
 if(BUILD_TESTING)

diff --git a/SRC/CMakeLists.txt b/SRC/CMakeLists.txt
index 4cbfff1a3f4c30009940d474b402304cfb09371b..8355e3dc942674e356f36d5683f2caf7957d329e 100644 (file)
--- a/SRC/CMakeLists.txt
+++ b/SRC/CMakeLists.txt
@@ -373,7 +373,7 @@ set(ZXLASRC  zgesvxx.f zgerfsx.f zla_gerfsx_extended.f zla_geamv.f
    zla_lin_berr.f zlarscl2.f zlascl2.f zla_wwaddw.f)
 
 
-if( USEXBLAS)
+if( USE_XBLAS)
   set(ALLXOBJ ${SXLASRC} ${DXLASRC} ${CXLASRC} ${ZXLASRC} ${ALLXAUX})
 endif()
 
@@ -392,5 +392,5 @@ if(BUILD_COMPLEX16)
   set(ALLOBJ  ${ZLASRC} ${ALLAUX} ${DZLAUX} ${ZCLASRC})
 endif()
 add_library(lapack ${ALLOBJ} ${ALLXOBJ})
-target_link_libraries(lapack ${BLAS_LIBRARIES})
+target_link_libraries(lapack ${BLAS_LIBRARIES} ${XBLAS_LIBRARY})
 lapack_install_library(lapack)