|
|
@@ -190,7 +190,7 @@ endmacro()
|
|
|
|
|
|
# TODO: move this stuff to a separate module
|
|
|
|
|
|
-macro(CHECK_LAPACK_LIBRARIES LIBRARIES _prefix _name _flags _list _threadlibs _addlibdir _subdirs _blas)
|
|
|
+macro(CHECK_LAPACK_LIBRARIES LIBRARIES _prefix _name _flags _list _deps _addlibdir _subdirs _blas)
|
|
|
# This macro checks for the existence of the combination of fortran libraries
|
|
|
# given by _list. If the combination is found, this macro checks (using the
|
|
|
# Check_Fortran_Function_Exists macro) whether can link against that library
|
|
|
@@ -224,8 +224,8 @@ macro(CHECK_LAPACK_LIBRARIES LIBRARIES _prefix _name _flags _list _threadlibs _a
|
|
|
list(APPEND ${LIBRARIES} "${_library}")
|
|
|
else()
|
|
|
set(_combined_name ${_combined_name}_${_library})
|
|
|
- if(NOT "${_threadlibs}" STREQUAL "")
|
|
|
- set(_combined_name ${_combined_name}_threadlibs)
|
|
|
+ if(NOT "${_deps}" STREQUAL "")
|
|
|
+ set(_combined_name ${_combined_name}_deps)
|
|
|
endif()
|
|
|
if(_libraries_work)
|
|
|
find_library(${_prefix}_${_library}_LIBRARY
|
|
|
@@ -248,7 +248,7 @@ macro(CHECK_LAPACK_LIBRARIES LIBRARIES _prefix _name _flags _list _threadlibs _a
|
|
|
endforeach()
|
|
|
if(_libraries_work)
|
|
|
# Test this combination of libraries.
|
|
|
- set(CMAKE_REQUIRED_LIBRARIES ${_flags} ${${LIBRARIES}} ${_blas} ${_threadlibs})
|
|
|
+ set(CMAKE_REQUIRED_LIBRARIES ${_flags} ${${LIBRARIES}} ${_blas} ${_deps})
|
|
|
if(CMAKE_Fortran_COMPILER_LOADED)
|
|
|
check_fortran_function_exists("${_name}" ${_prefix}${_combined_name}_WORKS)
|
|
|
else()
|
|
|
@@ -262,7 +262,7 @@ macro(CHECK_LAPACK_LIBRARIES LIBRARIES _prefix _name _flags _list _threadlibs _a
|
|
|
if("${_list}${_blas}" STREQUAL "")
|
|
|
set(${LIBRARIES} "${LIBRARIES}-PLACEHOLDER-FOR-EMPTY-LIBRARIES")
|
|
|
else()
|
|
|
- list(APPEND ${LIBRARIES} ${_blas} ${_threadlibs})
|
|
|
+ list(APPEND ${LIBRARIES} ${_blas} ${_deps})
|
|
|
endif()
|
|
|
else()
|
|
|
set(${LIBRARIES} FALSE)
|