1. Fixed a typo in FindBLAS for SGI (SCCL should have been SCSL) and 2. Fixed compi...

- Chuck Atkins (Kitware)

diff --git a/CMAKE/CheckLAPACKCompilerFlags.cmake b/CMAKE/CheckLAPACKCompilerFlags.cmake
index 560ee4a3ce6af382b4829802d99a19ac50ca537f..6c5b53fb5a28c7dda5feb780cb300283328c2615 100644 (file)
--- a/CMAKE/CheckLAPACKCompilerFlags.cmake
+++ b/CMAKE/CheckLAPACKCompilerFlags.cmake
@@ -36,11 +36,11 @@ elseif( CMAKE_Fortran_COMPILER_ID STREQUAL "Intel" )
 # SunPro F95
 elseif( CMAKE_Fortran_COMPILER_ID STREQUAL "SunPro" )
   if( ("${CMAKE_Fortran_FLAGS}" MATCHES "-ftrap=") AND
-          NOT ("${CMAKE_Fortran_FLAGS}" MATCHES "-ftrap=none") )
+      NOT ("${CMAKE_Fortran_FLAGS}" MATCHES "-ftrap=%none") )
     set( FPE_EXIT TRUE )
   elseif( NOT (CMAKE_Fortran_FLAGS MATCHES "-ftrap=") )
-    message( STATUS "Disabling FPE trap handlers with -ftrap=none" )
-    set( CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} -ftrap=none"
+    message( STATUS "Disabling FPE trap handlers with -ftrap=%none" )
+    set( CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} -ftrap=%none"
          CACHE STRING "Flags for Fortran compiler." FORCE )
   endif()
 

diff --git a/CMAKE/FindBLAS.cmake b/CMAKE/FindBLAS.cmake
index a4e0b675903ced20602edcf16984e519e396db2e..4c37e222409c9557bc9c36d3f3132fb48b5cd8ea 100644 (file)
--- a/CMAKE/FindBLAS.cmake
+++ b/CMAKE/FindBLAS.cmake
@@ -47,7 +47,7 @@
 #   PERFLIB   - Oracle Performance Library (formerly Sun Performance Library)
 #   SUNPERF   - Oracle Performance Library (formerly Sun Performance Library)
 #             See http://www.oracle.com/technetwork/server-storage/solarisstudio
-#   SCCL      - SGI's Scientific Computing Software Library
+#   SCSL      - SGI's Scientific Computing Software Library
 #             See http://www.sgi.com/products/software/irix/scsl.html
 #
 #   OTHER     - Any other unsupported BLAS library
@@ -167,7 +167,7 @@ if( NOT BLAS_VENDORS )
   # If not specified, we will search through the list of known suppliers
   # Note that for libs that contains both 4 and 8 byte int versions, only the
   # 4 byte versions are searched for.
-  set( BLAS_VENDORS ACML ACCELERATE ATLAS GOTO VECLIB ESSL MKL PERFLIB SCCL GENERIC)
+  set( BLAS_VENDORS ACML ACCELERATE ATLAS GOTO VECLIB ESSL MKL PERFLIB SCSL GENERIC)
 endif()
 set( BLAS_VENDORS_FOUND )
 foreach( _BLAS_VENDOR ${BLAS_VENDORS} )
@@ -309,9 +309,9 @@ foreach( _BLAS_VENDOR ${BLAS_VENDORS} )
     _BLAS_LOCATE_AND_TEST( ${_BLAS_VENDOR} "blas" "" )
   
   # SGI
-  elseif( _BLAS_VENDOR STREQUAL "SCCL" )
-    message( STATUS "FindBLAS: Searching for SGI SCCL" )
-    _BLAS_LOCATE_AND_TEST( ${_BLAS_VENDOR} "sccl" "" )
+  elseif( _BLAS_VENDOR STREQUAL "SCSL" )
+    message( STATUS "FindBLAS: Searching for SGI SCSL" )
+    _BLAS_LOCATE_AND_TEST( ${_BLAS_VENDOR} "scsl" "" )
   
   # Sun / Oracle PerfLib
   elseif( (_BLAS_VENDOR STREQUAL "PERFLIB") OR