diff options
| -rw-r--r-- | Modules/FindBLAS.cmake | 14 | ||||
| -rw-r--r-- | Modules/FindLAPACK.cmake | 14 |
2 files changed, 12 insertions, 16 deletions
diff --git a/Modules/FindBLAS.cmake b/Modules/FindBLAS.cmake index 5d11511..ed11364 100644 --- a/Modules/FindBLAS.cmake +++ b/Modules/FindBLAS.cmake @@ -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}") diff --git a/Modules/FindLAPACK.cmake b/Modules/FindLAPACK.cmake index bd7bacc..8ade0b1 100644 --- a/Modules/FindLAPACK.cmake +++ b/Modules/FindLAPACK.cmake @@ -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}") |