Browse Source

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 <[email protected]>
Merge-request: !4982
Brad King 5 years ago
parent
commit
8a3a1cf71a
2 changed files with 2 additions and 2 deletions
  1. 1 1
      Modules/FindBLAS.cmake
  2. 1 1
      Modules/FindLAPACK.cmake

+ 1 - 1
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)

+ 1 - 1
Modules/FindLAPACK.cmake

@@ -280,7 +280,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)