echo/CMake
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Find{BLAS,LAPACK}: Avoid clobbering results when no vendor is requested

Browse Source 
Logic added by commit 4c74c86f40 (FindBLAS/LAPACK: Add support for the
Fujitsu SSL2 library, 2021-01-27, v3.21.0-rc1~402^2~1) accidentally
expressed a boolean condition without proper grouping.  The pattern was
then copied by commit 2c9e623e31 (Find{BLAS,LAPACK}: Add support for the
NVHPC LAPACK library, 2021-05-05, v3.21.0-rc1~192^2).  The resulting
logic incorrectly tries Fujitsu and NVHPC vendors even after results are
found from another vendor, and then erases those.  Fix the grouping.

Fixes: #22403
This commit is contained in:
Brad King 2021-07-12 14:57:06 +00:00
parent ac984cb5f7
commit 57dcde19da
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Modules/FindBLAS.cmake
View File

@ -1110,8 +1110,8 @@ if(BLA_VENDOR MATCHES "EML" OR BLA_VENDOR STREQUAL "All")
endif()
# Fujitsu SSL2 Library?
if(NOT BLAS_LIBRARIES AND
BLA_VENDOR MATCHES "Fujitsu_SSL2" OR BLA_VENDOR STREQUAL "All")
if(NOT BLAS_LIBRARIES
AND (BLA_VENDOR MATCHES "Fujitsu_SSL2" OR BLA_VENDOR STREQUAL "All"))
if(BLA_VENDOR STREQUAL "Fujitsu_SSL2BLAMP")
set(_ssl2_suffix BLAMP)
else()

4
Modules/FindLAPACK.cmake
View File

@ -550,7 +550,7 @@ if(NOT LAPACK_NOT_FOUND_MESSAGE)
# Fujitsu SSL2 Library?
if(NOT LAPACK_LIBRARIES
AND BLA_VENDOR MATCHES "Fujitsu_SSL2" OR BLA_VENDOR STREQUAL "All")
AND (BLA_VENDOR MATCHES "Fujitsu_SSL2" OR BLA_VENDOR STREQUAL "All"))
if(BLA_VENDOR STREQUAL "Fujitsu_SSL2BLAMP")
set(_ssl2_suffix BLAMP)
else()
@ -582,7 +582,7 @@ if(NOT LAPACK_NOT_FOUND_MESSAGE)
# NVHPC Library?
if(NOT LAPACK_LIBRARIES
AND BLA_VENDOR MATCHES "NVHPC" OR BLA_VENDOR STREQUAL "All")
AND (BLA_VENDOR MATCHES "NVHPC" OR BLA_VENDOR STREQUAL "All"))
check_lapack_libraries(
LAPACK_LIBRARIES
LAPACK