diff options
| author | Brad King <brad.king@kitware.com> | 2020-07-08 12:23:25 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2020-07-08 12:23:31 (GMT) |
| commit | 32e833d5cf8d32bfa4731f3510cc9068826738c6 (patch) | |
| tree | 77501e44ae8ef32709b8eb67ecf54bb735a8a8a3 | |
| parent | dab33d1e3339c0f06437692db0c3e1db49765ba2 (diff) | |
| parent | 196f042b58afbe00d96372c43d4146153987806f (diff) | |
| download | CMake-32e833d5cf8d32bfa4731f3510cc9068826738c6.zip CMake-32e833d5cf8d32bfa4731f3510cc9068826738c6.tar.gz CMake-32e833d5cf8d32bfa4731f3510cc9068826738c6.tar.bz2 | |
Merge topic 'find-blas-lapack-mklroot-win' into release-3.18
196f042b58 FindLAPACK: Handle Windows Intel MKLROOT with backslash
96c19ecd55 FindBLAS: Handle Windows Intel MKLROOT with backslash
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4982
| -rw-r--r-- | Modules/FindBLAS.cmake | 2 | ||||
| -rw-r--r-- | Modules/FindLAPACK.cmake | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/Modules/FindBLAS.cmake b/Modules/FindBLAS.cmake index 4c569b3..60f178b 100644 --- a/Modules/FindBLAS.cmake +++ b/Modules/FindBLAS.cmake @@ -473,7 +473,7 @@ if(BLA_VENDOR MATCHES "Intel" OR BLA_VENDOR STREQUAL "All") set(BLAS_mkl_OS_NAME "lin") endif() if(DEFINED ENV{MKLROOT}) - set(BLAS_mkl_MKLROOT "$ENV{MKLROOT}") + file(TO_CMAKE_PATH "$ENV{MKLROOT}" BLAS_mkl_MKLROOT) # If MKLROOT points to the subdirectory 'mkl', use the parent directory instead # so we can better detect other relevant libraries in 'compiler' or 'tbb': get_filename_component(BLAS_mkl_MKLROOT_LAST_DIR "${BLAS_mkl_MKLROOT}" NAME) diff --git a/Modules/FindLAPACK.cmake b/Modules/FindLAPACK.cmake index e275946..31e7de6 100644 --- a/Modules/FindLAPACK.cmake +++ b/Modules/FindLAPACK.cmake @@ -279,7 +279,7 @@ if(BLAS_FOUND) set(LAPACK_mkl_OS_NAME "lin") endif() if(DEFINED ENV{MKLROOT}) - set(LAPACK_mkl_MKLROOT "$ENV{MKLROOT}") + file(TO_CMAKE_PATH "$ENV{MKLROOT}" LAPACK_mkl_MKLROOT) # If MKLROOT points to the subdirectory 'mkl', use the parent directory instead # so we can better detect other relevant libraries in 'compiler' or 'tbb': get_filename_component(LAPACK_mkl_MKLROOT_LAST_DIR "${LAPACK_mkl_MKLROOT}" NAME) |