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 | 8a3a1cf71a96f1503eefe3fef45f2665e826fa70 (patch) | |
| tree | 74d660df0857302932fdb944750e33ba7df71af3 /Modules/FindBLAS.cmake | |
| parent | e9275ad1a12b8d8baf4b8c693393f9f7d16454da (diff) | |
| parent | 196f042b58afbe00d96372c43d4146153987806f (diff) | |
| download | CMake-8a3a1cf71a96f1503eefe3fef45f2665e826fa70.zip CMake-8a3a1cf71a96f1503eefe3fef45f2665e826fa70.tar.gz CMake-8a3a1cf71a96f1503eefe3fef45f2665e826fa70.tar.bz2 | |
Merge topic 'find-blas-lapack-mklroot-win'
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
Diffstat (limited to 'Modules/FindBLAS.cmake')
| -rw-r--r-- | Modules/FindBLAS.cmake | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Modules/FindBLAS.cmake b/Modules/FindBLAS.cmake index b2df4ad..1e3b563 100644 --- a/Modules/FindBLAS.cmake +++ b/Modules/FindBLAS.cmake @@ -478,7 +478,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) |