mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-01-02 03:39:43 -06:00
Code Issues Packages Projects Releases Wiki Activity

Find{BLAS,LAPACK}: Prefer BLA_VENDOR cmake variable over env variable

Browse Source 
This is implied by the documentation, but was not implemented properly.

Fixes: #24664
This commit is contained in:
Brad King
2023-04-03 09:58:58 -04:00
parent 2c59598b91
commit 9d18426c47
2 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Modules/FindBLAS.cmake
View File

@@ -386,10 +386,10 @@ set(BLAS_LINKER_FLAGS)
set(BLAS_LIBRARIES)
set(BLAS95_LIBRARIES)
set(_blas_fphsa_req_var BLAS_LIBRARIES)
if(NOT $ENV{BLA_VENDOR} STREQUAL "")
set(BLA_VENDOR $ENV{BLA_VENDOR})
else()
if(NOT BLA_VENDOR)
if(NOT BLA_VENDOR)
if(NOT "$ENV{BLA_VENDOR}" STREQUAL "")
set(BLA_VENDOR "$ENV{BLA_VENDOR}")
else()
set(BLA_VENDOR "All")
endif()
endif()

10
Modules/FindLAPACK.cmake
View File

@@ -304,10 +304,12 @@ endif()
# Search for different LAPACK distributions if BLAS is found
if(NOT LAPACK_NOT_FOUND_MESSAGE)
set(LAPACK_LINKER_FLAGS ${BLAS_LINKER_FLAGS})
if(NOT $ENV{BLA_VENDOR} STREQUAL "")
set(BLA_VENDOR $ENV{BLA_VENDOR})
elseif(NOT BLA_VENDOR)
set(BLA_VENDOR "All")
if(NOT BLA_VENDOR)
if(NOT "$ENV{BLA_VENDOR}" STREQUAL "")
set(BLA_VENDOR "$ENV{BLA_VENDOR}")
else()
set(BLA_VENDOR "All")
endif()
endif()
# LAPACK in the Intel MKL 10+ library?