diff options
Diffstat (limited to 'Modules')
| -rw-r--r-- | Modules/CMakeSwiftInformation.cmake | 2 | ||||
| -rw-r--r-- | Modules/CheckCXXSymbolExists.cmake | 2 | ||||
| -rw-r--r-- | Modules/FindBLAS.cmake | 16 |
3 files changed, 18 insertions, 2 deletions
diff --git a/Modules/CMakeSwiftInformation.cmake b/Modules/CMakeSwiftInformation.cmake index 21f18d4..6f99c1f 100644 --- a/Modules/CMakeSwiftInformation.cmake +++ b/Modules/CMakeSwiftInformation.cmake @@ -23,6 +23,8 @@ set(CMAKE_Swift_COMPILE_OPTIONS_TARGET "-target ") set(CMAKE_Swift_COMPILER_ARG1 -frontend) set(CMAKE_Swift_DEFINE_FLAG -D) set(CMAKE_Swift_FRAMEWORK_SEARCH_FLAG "-F ") +set(CMAKE_Swift_LIBRARY_PATH_FLAG "-L ") +set(CMAKE_Swift_LIBRARY_PATH_TERMINATOR "") set(CMAKE_Swift_LINKER_WRAPPER_FLAG "-Xlinker" " ") set(CMAKE_Swift_RESPONSE_FILE_LINK_FLAG @) diff --git a/Modules/CheckCXXSymbolExists.cmake b/Modules/CheckCXXSymbolExists.cmake index 970e301..2cccd09 100644 --- a/Modules/CheckCXXSymbolExists.cmake +++ b/Modules/CheckCXXSymbolExists.cmake @@ -24,7 +24,7 @@ Check if a symbol exists as a function, variable, or macro in C++ as a function or variable then the symbol must also be available for linking. If the symbol is a type or enum value it will not be recognized (consider using :module:`CheckTypeSize` - or :module:`CheckCSourceCompiles`). + or :module:`CheckCXXSourceCompiles`). The following variables may be set before calling this macro to modify the way the check is run: diff --git a/Modules/FindBLAS.cmake b/Modules/FindBLAS.cmake index 65e5d1c..77f9d0e 100644 --- a/Modules/FindBLAS.cmake +++ b/Modules/FindBLAS.cmake @@ -152,7 +152,9 @@ macro(Check_Fortran_Libraries LIBRARIES _prefix _name _flags _list _thread) foreach(_library ${_list}) set(_combined_name ${_combined_name}_${_library}) - + if(NOT "${_thread}" STREQUAL "") + set(_combined_name ${_combined_name}_thread) + endif() if(_libraries_work) if (BLA_STATIC) if (WIN32) @@ -479,6 +481,18 @@ if (BLA_VENDOR STREQUAL "OpenBLAS" OR BLA_VENDOR STREQUAL "All") "" ) endif() + if(NOT BLAS_LIBRARIES) + find_package(Threads) + # OpenBLAS (http://www.openblas.net) + check_fortran_libraries( + BLAS_LIBRARIES + BLAS + sgemm + "" + "openblas" + "${CMAKE_THREAD_LIBS_INIT}" + ) + endif() endif () if (BLA_VENDOR STREQUAL "FLAME" OR BLA_VENDOR STREQUAL "All") |