Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
OpenDAS
dlib
Commits
9ff91169
Commit
9ff91169
authored
Nov 19, 2018
by
Facundo Galán
Committed by
Davis E. King
Nov 19, 2018
Browse files
Fix find_blas.cmake bug: find mkl fft on windows. (#1557)
parent
a85a53ce
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
20 additions
and
0 deletions
+20
-0
dlib/cmake_utils/find_blas.cmake
dlib/cmake_utils/find_blas.cmake
+20
-0
No files found.
dlib/cmake_utils/find_blas.cmake
View file @
9ff91169
...
...
@@ -312,6 +312,20 @@ elseif(WIN32 AND NOT MINGW)
INCLUDE
(
CheckFunctionExists
)
# Get mkl_include_dir
set
(
mkl_include_search_path
"C:/Program Files (x86)/IntelSWTools/compilers_and_libraries_*/windows/mkl/include"
"C:/Program Files (x86)/IntelSWTools/compilers_and_libraries_*/windows/compiler/include"
"C:/Program Files (x86)/IntelSWTools/compilers_and_libraries/windows/compiler/include"
"C:/Program Files (x86)/IntelSWTools/compilers_and_libraries/windows/mkl/include"
"C:/Program Files (x86)/Intel/Composer XE/mkl/include"
"C:/Program Files (x86)/Intel/Composer XE/compiler/include"
"C:/Program Files/Intel/Composer XE/mkl/include"
"C:/Program Files/Intel/Composer XE/compiler/include"
)
find_path
(
mkl_include_dir mkl_version.h
${
mkl_include_search_path
}
)
mark_as_advanced
(
mkl_include_dir
)
# Search for the needed libraries from the MKL.
find_library
(
mkl_core mkl_core
${
mkl_search_path
}
)
set
(
mkl_libs
${
mkl_intel
}
${
mkl_core
}
)
...
...
@@ -333,6 +347,7 @@ elseif(WIN32 AND NOT MINGW)
set
(
lapack_libraries
${
mkl_libs
}
)
set
(
blas_found 1
)
set
(
lapack_found 1
)
set
(
found_intel_mkl 1
)
message
(
STATUS
"Found Intel MKL BLAS/LAPACK library"
)
# Make sure the version of the Intel MKL we found is compatible with
...
...
@@ -346,6 +361,11 @@ elseif(WIN32 AND NOT MINGW)
set
(
lapack_found 0
)
endif
()
endif
()
if
(
found_intel_mkl AND mkl_include_dir
)
set
(
found_intel_mkl_headers 1
)
endif
()
endif
()
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment