diff options
| author | David Cole <david.cole@kitware.com> | 2012-07-24 21:02:51 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2012-07-24 21:02:51 (GMT) |
| commit | d44ff1bea94a60b4c7df6498da23c20833a2e3e7 (patch) | |
| tree | 2d6733565e82f48524112cd2d2c4d89e0b42b1c8 | |
| parent | b5d9dba7b601e72b13781bcfac8a7e8bb995d095 (diff) | |
| parent | 79a4e2bbdd0dfd8e2812160b118ac17f09d4bdb0 (diff) | |
| download | CMake-d44ff1bea94a60b4c7df6498da23c20833a2e3e7.zip CMake-d44ff1bea94a60b4c7df6498da23c20833a2e3e7.tar.gz CMake-d44ff1bea94a60b4c7df6498da23c20833a2e3e7.tar.bz2 | |
Merge topic 'findblas'
79a4e2b Fixed: FindLAPACK does not find MKL 10.3 when using gcc 4.x
| -rw-r--r-- | Modules/FindBLAS.cmake | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/Modules/FindBLAS.cmake b/Modules/FindBLAS.cmake index 9eadfd1..1cf31c4 100644 --- a/Modules/FindBLAS.cmake +++ b/Modules/FindBLAS.cmake @@ -484,8 +484,7 @@ if (BLA_VENDOR MATCHES "Intel*" OR BLA_VENDOR STREQUAL "All") # mkl >= 10.3 if (CMAKE_C_COMPILER MATCHES ".+gcc.*") list(APPEND BLAS_SEARCH_LIBS - "mkl_blas95_lp64 mkl_intel_lp64 mkl_gnu_thread mkl_core") - set(LM "${LM};-lgomp") + "mkl_blas95_lp64 mkl_intel_lp64 mkl_gnu_thread mkl_core gomp") else () list(APPEND BLAS_SEARCH_LIBS "mkl_blas95_lp64 mkl_intel_lp64 mkl_intel_thread mkl_core iomp5") @@ -516,8 +515,7 @@ if (BLA_VENDOR MATCHES "Intel*" OR BLA_VENDOR STREQUAL "All") # mkl >= 10.3 if (CMAKE_C_COMPILER MATCHES ".+gcc.*") list(APPEND BLAS_SEARCH_LIBS - "mkl_intel_lp64 mkl_gnu_thread mkl_core") - set(LM "${LM};-lgomp") + "mkl_intel_lp64 mkl_gnu_thread mkl_core gomp") else () list(APPEND BLAS_SEARCH_LIBS "mkl_intel_lp64 mkl_intel_thread mkl_core iomp5") |