mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-01-11 16:32:14 -06:00
Code Issues Packages Projects Releases Wiki Activity

Find{BLAS,LAPACK}: Search always in dynamic linker paths

Browse Source 
Previously the search in the dynamic linker paths 'LIB', 'LD_LIBRARY_PATH'
and 'DYLD_LIBRARY_PATH' was dependent on the value of the environment
variable 'MKLROOT'. If MKLROOT was given, the dynamic linker paths where
not searched. This seems slightly counter-intuitive.
This PR changes the behavior so that MKLROOT is searched first, but if
unsuccesful, the dynamic linker paths are tried as well.
This commit is contained in:
Mario Emmenlauer
2020-01-24 10:08:37 +01:00
parent fde5fcbc71
commit 4d7c69208e
2 changed files with 12 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
Modules/FindBLAS.cmake
View File

@@ -161,14 +161,12 @@ macro(CHECK_BLAS_LIBRARIES LIBRARIES _prefix _name _flags _list _threadlibs _add
set(${LIBRARIES})
set(_combined_name)
if(NOT _addlibdir)
if(WIN32)
set(_addlibdir ENV LIB)
elseif(APPLE)
set(_addlibdir ENV DYLD_LIBRARY_PATH)
else()
set(_addlibdir ENV LD_LIBRARY_PATH)
endif()
if(WIN32)
list(APPEND _addlibdir ENV LIB)
elseif(APPLE)
list(APPEND _addlibdir ENV DYLD_LIBRARY_PATH)
else()
list(APPEND _addlibdir ENV LD_LIBRARY_PATH)
endif()
list(APPEND _addlibdir "${CMAKE_C_IMPLICIT_LINK_DIRECTORIES}")

14
Modules/FindLAPACK.cmake
View File

@@ -131,14 +131,12 @@ macro(CHECK_LAPACK_LIBRARIES LIBRARIES _prefix _name _flags _list _threadlibs _a
set(${LIBRARIES})
set(_combined_name)
if(NOT _addlibdir)
if(WIN32)
set(_addlibdir ENV LIB)
elseif(APPLE)
set(_addlibdir ENV DYLD_LIBRARY_PATH)
else()
set(_addlibdir ENV LD_LIBRARY_PATH)
endif()
if(WIN32)
list(APPEND _addlibdir ENV LIB)
elseif(APPLE)
list(APPEND _addlibdir ENV DYLD_LIBRARY_PATH)
else()
list(APPEND _addlibdir ENV LD_LIBRARY_PATH)
endif()
list(APPEND _addlibdir "${CMAKE_C_IMPLICIT_LINK_DIRECTORIES}")