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
a966aeb9
Commit
a966aeb9
authored
Dec 18, 2017
by
Davis King
Browse files
Fixed problem with openmp linking
parent
a5121e57
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
4 deletions
+4
-4
dlib/CMakeLists.txt
dlib/CMakeLists.txt
+1
-1
dlib/cmake_utils/cmake_find_blas.txt
dlib/cmake_utils/cmake_find_blas.txt
+3
-3
No files found.
dlib/CMakeLists.txt
View file @
a966aeb9
...
...
@@ -638,7 +638,7 @@ if (NOT TARGET dlib)
${
CUDA_curand_LIBRARY
}
${
cusolver
}
)
if
(
OPENMP_FOUND
)
if
(
openmp_libraries
)
list
(
APPEND dlib_needed_libraries
${
openmp_libraries
}
)
endif
()
...
...
dlib/cmake_utils/cmake_find_blas.txt
View file @
a966aeb9
...
...
@@ -16,7 +16,7 @@
# lapack_libraries - link against these to use LAPACK library
# mkl_libraries - link against these to use the MKL library
# mkl_include_dir - add to the include path to use the MKL library
# openmp_libari
r
es - Set to Intel's OpenMP library if and only if we
# openmp_lib
r
aries - Set to Intel's OpenMP library if and only if we
# find the MKL.
# setting this makes CMake allow normal looking if else statements
...
...
@@ -101,8 +101,8 @@ if (UNIX OR MINGW)
# Search for the needed libraries from the MKL. We will try to link against the mkl_rt
# file first since this way avoids linking bugs in some cases.
find_library(mkl_rt mkl_rt ${mkl_search_path})
find_library(openmp_libari
r
es iomp5 ${mkl_search_path})
mark_as_advanced( mkl_rt openmp_libari
r
es )
find_library(openmp_lib
r
aries iomp5 ${mkl_search_path})
mark_as_advanced( mkl_rt openmp_lib
r
aries )
# if we found the MKL
if ( mkl_rt)
set(mkl_libraries ${mkl_rt} )
...
...
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