diff options
| author | David Cole <david.cole@kitware.com> | 2011-12-16 15:14:17 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2011-12-16 15:14:17 (GMT) |
| commit | ac9453c371132d12d975385be8376af0f76d8078 (patch) | |
| tree | e4613f0b764fabe1cb0e59c140e00acbb444a274 | |
| parent | c68a780dece71b23664ea65c670a5771e638245a (diff) | |
| parent | b3c42cb0123c7d21b6a23b1b7517cbb27d55df76 (diff) | |
| download | CMake-ac9453c371132d12d975385be8376af0f76d8078.zip CMake-ac9453c371132d12d975385be8376af0f76d8078.tar.gz CMake-ac9453c371132d12d975385be8376af0f76d8078.tar.bz2 | |
Merge topic 'fix-lapack-issues'
b3c42cb FindLAPACK: List thread libs to avoid link errors (#12625)
f603cf2 FindLAPACK: Correct CMAKE_FIND_LIBRARY_SUFFIXES spelling (#12624)
| -rw-r--r-- | Modules/FindLAPACK.cmake | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/Modules/FindLAPACK.cmake b/Modules/FindLAPACK.cmake index f88eed0..884266f 100644 --- a/Modules/FindLAPACK.cmake +++ b/Modules/FindLAPACK.cmake @@ -80,17 +80,17 @@ foreach(_library ${_list}) if(_libraries_work) if (BLA_STATIC) if (WIN32) - set(CMAKE_FIND_LIBRARY_SUFFIXES .lib ${CMAKE_FIND_LIBRRAY_SUFFIXES}) + set(CMAKE_FIND_LIBRARY_SUFFIXES .lib ${CMAKE_FIND_LIBRARY_SUFFIXES}) endif ( WIN32 ) if (APPLE) - set(CMAKE_FIND_LIBRARY_SUFFIXES .lib ${CMAKE_FIND_LIBRRAY_SUFFIXES}) + set(CMAKE_FIND_LIBRARY_SUFFIXES .lib ${CMAKE_FIND_LIBRARY_SUFFIXES}) else (APPLE) - set(CMAKE_FIND_LIBRARY_SUFFIXES .a ${CMAKE_FIND_LIBRRAY_SUFFIXES}) + set(CMAKE_FIND_LIBRARY_SUFFIXES .a ${CMAKE_FIND_LIBRARY_SUFFIXES}) endif (APPLE) else (BLA_STATIC) if (CMAKE_SYSTEM_NAME STREQUAL "Linux") # for ubuntu's libblas3gf and liblapack3gf packages - set(CMAKE_FIND_LIBRARY_SUFFIXES ${CMAKE_FIND_LIBRRAY_SUFFIXES} .so.3gf) + set(CMAKE_FIND_LIBRARY_SUFFIXES ${CMAKE_FIND_LIBRARY_SUFFIXES} .so.3gf) endif () endif (BLA_STATIC) find_library(${_prefix}_${_library}_LIBRARY @@ -123,7 +123,7 @@ if(_libraries_work) endif(_libraries_work) if(_libraries_work) - set(${LIBRARIES} ${${LIBRARIES}} ${_blas}) + set(${LIBRARIES} ${${LIBRARIES}} ${_blas} ${_threads}) else(_libraries_work) set(${LIBRARIES} FALSE) endif(_libraries_work) |