minor modif on find BLAS

diff --git a/CMAKE/FindBLAS.cmake b/CMAKE/FindBLAS.cmake
index 082312b1a6cc9e18a5c9ae351b68aa22535ee2ac..558f1efff7ebaf25e2c243819ee9e4a3f05065fe 100644 (file)
--- a/CMAKE/FindBLAS.cmake
+++ b/CMAKE/FindBLAS.cmake
@@ -174,7 +174,7 @@ endmacro()
 
 # Loop through the BLAS vendors looking for specific libraries
 if( NOT BLAS_VENDORS )
-  set( BLAS_VENDORS AMD AMD_MP APPLE ATLAS GOTO HP HP_INT64 IBM INTEL32 INTEL64 INTEL64_INT64 NETLIB SGI SUN)
+  set( BLAS_VENDORS AMD AMD_MP ACCELERATE ATLAS GOTO VECLIB VECLIB8 IBM INTEL32 INTEL64 INTEL64_INT64 PRE-INSTALLED SGI SUN)
 endif()
 set( BLAS_VENDORS_FOUND )
 foreach( _BLAS_VENDOR ${BLAS_VENDORS} )
@@ -202,7 +202,7 @@ foreach( _BLAS_VENDOR ${BLAS_VENDORS} )
     _BLAS_LOCATE_AND_TEST( ${_BLAS_VENDOR} "acml_mp" "" )
   
   # Apple Accelerate 
-  elseif( _BLAS_VENDOR STREQUAL "APPLE" )
+  elseif( _BLAS_VENDOR STREQUAL "ACCELERATE" )
     message( STATUS "FindBLAS: Searching for Apple Accelerate" )
     _BLAS_LOCATE_AND_TEST( 
       ${_BLAS_VENDOR} "Accelerate" "-framework Accelerate" 
@@ -218,14 +218,14 @@ foreach( _BLAS_VENDOR ${BLAS_VENDORS} )
     message( STATUS "FindBLAS: Searching for GotoBLAS2" )
     _BLAS_LOCATE_AND_TEST( ${_BLAS_VENDOR} "goto2" "" )
   
-  # HP VECLIB
-  elseif( _BLAS_VENDOR STREQUAL "HP" )
-    message( STATUS "FindBLAS: Searching for HP VECLIB" )
+  # VECLIB
+  elseif( _BLAS_VENDOR STREQUAL "VECLIB" )
+    message( STATUS "FindBLAS: Searching for VECLIB" )
     _BLAS_LOCATE_AND_TEST( ${_BLAS_VENDOR} "veclib" "" )
   
-  # HP VECLIB8
-  elseif( _BLAS_VENDOR STREQUAL "HP_INT64" )
-    message( STATUS "FindBLAS: Searching for HP VECLIB8" )
+  # VECLIB8
+  elseif( _BLAS_VENDOR STREQUAL "VECLIB8" )
+    message( STATUS "FindBLAS: Searching for VECLIB8" )
     _BLAS_LOCATE_AND_TEST( ${_BLAS_VENDOR} "veclib8" "" )
   
   # IBM ESSL
@@ -289,9 +289,9 @@ foreach( _BLAS_VENDOR ${BLAS_VENDORS} )
       )
     endif()
   
-  # Netlib reference
-  elseif( _BLAS_VENDOR STREQUAL "NETLIB" )
-    message( STATUS "FindBLAS: Searching for Netlib BLAS" )
+  # Pre-installed BLAS
+  elseif( _BLAS_VENDOR STREQUAL "PRE-INSTALLED" )
+    message( STATUS "FindBLAS: Searching for pre-installed BLAS" )
     _BLAS_LOCATE_AND_TEST( ${_BLAS_VENDOR} "blas" "" )
   
   # SGI
@@ -321,7 +321,7 @@ if( _BLAS_VENDORS_FOUND_LENGTH EQUAL 0 )
 endif()
 list( GET BLAS_VENDORS_FOUND 0 BLAS_VENDOR_FOUND )
 message( STATUS "FindBLAS: BLAS Vendor selected - ${BLAS_VENDOR_FOUND}" )
-set( BLAS_LIBRARIES ${BLAS_${BLAS_VENDOR_FOUND}_LIBRARIES} )
-set( BLAS_LINKER_FLAGS ${BLAS_${BLAS_VENDOR_FOUND}_LINKER_FLAGS} )
-set( BLAS_FOUND TRUE )
+set( BLAS_LIBRARIES ${BLAS_${BLAS_VENDOR_FOUND}_LIBRARIES} CACHE PATH "")
+set( BLAS_LINKER_FLAGS ${BLAS_${BLAS_VENDOR_FOUND}_LINKER_FLAGS} CACHE PATH "" )
+set( BLAS_FOUND TRUE CACHE OPTION "")
 

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 4b588acde911a3f8d8fcd1be85544aa7a2af82c3..1f7a4bb44ab87665cde765c72b78f4c1c6585467 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -46,16 +46,16 @@ set(DSECOND_SRC  ${LAPACK_SOURCE_DIR}/INSTALL/dsecnd_${TIME_FUNC}.f)
 # --------------------------------------------------
 # Subdirectories that need to be processed
 
-option(USE_SYSTEM_BLAS "Whether or not to use an external BLAS library or the
-included netlib BLAS" OFF)
-if( USE_SYSTEM_BLAS )
+option(LOOK_FOR_OPTIMZED_BLAS "Whether or not to use an optimized BLAS library or the included netlib BLAS" OFF)
+if( LOOK_FOR_OPTIMZED_BLAS )
   find_package( BLAS )
-endif(USE_SYSTEM_BLAS)
+endif(LOOK_FOR_OPTIMZED_BLAS)
 if(NOT BLAS_FOUND)
   add_subdirectory(BLAS)
   set( BLAS_LIBRARIES blas )
 endif( NOT BLAS_FOUND )
 
+
 add_subdirectory(SRC)
 add_subdirectory(TESTING)