diff options
| author | Brad King <brad.king@kitware.com> | 2020-06-24 11:02:55 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2020-06-24 11:03:00 (GMT) |
| commit | 9c73be33a0c7be9ffccd8f814e03718cccc1236b (patch) | |
| tree | 2c148338aef586a9e3edf97c5429c4f508b14616 | |
| parent | bb2d9a02be8d78c9e7a22f09fc8e5890283a4a8d (diff) | |
| parent | 56e645a4c3f644a0ed32c472363781c5f01d81d8 (diff) | |
| download | CMake-9c73be33a0c7be9ffccd8f814e03718cccc1236b.zip CMake-9c73be33a0c7be9ffccd8f814e03718cccc1236b.tar.gz CMake-9c73be33a0c7be9ffccd8f814e03718cccc1236b.tar.bz2 | |
Merge topic 'mkl-win32'
56e645a4c3 Find{BLAS,LAPACK}: Add missing thread library for Intel MKL on Win32
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4936
| -rw-r--r-- | Modules/FindBLAS.cmake | 6 | ||||
| -rw-r--r-- | Modules/FindLAPACK.cmake | 2 |
2 files changed, 6 insertions, 2 deletions
diff --git a/Modules/FindBLAS.cmake b/Modules/FindBLAS.cmake index c5d791e..29871c5 100644 --- a/Modules/FindBLAS.cmake +++ b/Modules/FindBLAS.cmake @@ -36,7 +36,7 @@ The following variables may be set to influence this module's behavior: * ``SCSL`` * ``SGIMATH`` * ``IBMESSL`` - * ``Intel10_32`` (intel mkl v10 32 bit) + * ``Intel10_32`` (intel mkl v10 32 bit, threaded code) * ``Intel10_64lp`` (intel mkl v10+ 64 bit, threaded code, lp64 model) * ``Intel10_64lp_seq`` (intel mkl v10+ 64 bit, sequential code, lp64 model) * ``Intel10_64ilp`` (intel mkl v10+ 64 bit, threaded code, ilp64 model) @@ -397,6 +397,10 @@ if(BLA_VENDOR MATCHES "Intel" OR BLA_VENDOR STREQUAL "All") # Add threading/sequential libs set(BLAS_SEARCH_LIBS_WIN_THREAD "") + if(BLA_VENDOR STREQUAL "Intel10_32" OR BLA_VENDOR STREQUAL "All") + list(APPEND BLAS_SEARCH_LIBS_WIN_THREAD + "libiomp5md mkl_intel_thread${BLAS_mkl_DLL_SUFFIX}") + endif() if(BLA_VENDOR MATCHES "^Intel10_64i?lp$" OR BLA_VENDOR STREQUAL "All") # old version list(APPEND BLAS_SEARCH_LIBS_WIN_THREAD diff --git a/Modules/FindLAPACK.cmake b/Modules/FindLAPACK.cmake index a18cec4..01ce074 100644 --- a/Modules/FindLAPACK.cmake +++ b/Modules/FindLAPACK.cmake @@ -28,7 +28,7 @@ The following variables may be set to influence this module's behavior: * ``OpenBLAS`` * ``FLAME`` - * ``Intel10_32`` (intel mkl v10 32 bit) + * ``Intel10_32`` (intel mkl v10 32 bit, threaded code) * ``Intel10_64lp`` (intel mkl v10+ 64 bit, threaded code, lp64 model) * ``Intel10_64lp_seq`` (intel mkl v10+ 64 bit, sequential code, lp64 model) * ``Intel10_64ilp`` (intel mkl v10+ 64 bit, threaded code, ilp64 model) |