diff options
| author | julie <julielangou@users.noreply.github.com> | 2010-12-24 15:29:47 +0000 |
|---|---|---|
| committer | julie <julielangou@users.noreply.github.com> | 2010-12-24 15:29:47 +0000 |
| commit | 8146c9b43ff15ddaff4e6462f5598b28a965da16 (patch) | |
| tree | 95ef24749e5b141e75efad58070580071a4fd4a0 | |
| parent | 7f144b46d47152b1b0ed100978ee35f87aae15e8 (diff) | |
| download | lapack-8146c9b43ff15ddaff4e6462f5598b28a965da16.tar.gz lapack-8146c9b43ff15ddaff4e6462f5598b28a965da16.tar.bz2 lapack-8146c9b43ff15ddaff4e6462f5598b28a965da16.zip | |
1. Fixed a typo in FindBLAS for SGI (SCCL should have been SCSL) and 2. Fixed compiler flag check for SunPro to use ftrap=%none instead of ftrap=none.
- Chuck Atkins (Kitware)
| -rw-r--r-- | CMAKE/CheckLAPACKCompilerFlags.cmake | 6 | ||||
| -rw-r--r-- | CMAKE/FindBLAS.cmake | 10 |
2 files changed, 8 insertions, 8 deletions
diff --git a/CMAKE/CheckLAPACKCompilerFlags.cmake b/CMAKE/CheckLAPACKCompilerFlags.cmake index 560ee4a3..6c5b53fb 100644 --- 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 a4e0b675..4c37e222 100644 --- 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 |