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
6ec3aea9
Commit
6ec3aea9
authored
Aug 26, 2018
by
Davis King
Browse files
Fixed nvcc getting upset about openmp in some environments.
parent
148dba97
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
8 additions
and
2 deletions
+8
-2
dlib/CMakeLists.txt
dlib/CMakeLists.txt
+8
-2
No files found.
dlib/CMakeLists.txt
View file @
6ec3aea9
...
@@ -681,8 +681,14 @@ if (NOT TARGET dlib)
...
@@ -681,8 +681,14 @@ if (NOT TARGET dlib)
# look for one to link to if our use of BLAS, specifically the
# look for one to link to if our use of BLAS, specifically the
# Intel MKL, hasn't already decided what to use. This is because
# Intel MKL, hasn't already decided what to use. This is because
# it makes the MKL bug out if you link to another openmp lib other
# it makes the MKL bug out if you link to another openmp lib other
# than Intel's when you use the MKL.
# than Intel's when you use the MKL. I'm also not really sure when
if
(
NOT openmp_libraries AND NOT MSVC AND NOT XCODE AND NOT APPLE
)
# explicit linking to openmp became unnecessary, but for
# sufficiently older versions of cuda it was needed. Then in
# versions of cmake newer than 3.11 linking to openmp started to
# mess up the switches passed to nvcc, so you can't just leave
# these "try to link to openmp" statements here going forward. Fun
# times.
if
(
CUDA_VERSION VERSION_LESS
"9.1"
AND NOT openmp_libraries AND NOT MSVC AND NOT XCODE AND NOT APPLE
)
find_package
(
OpenMP
)
find_package
(
OpenMP
)
if
(
OPENMP_FOUND
)
if
(
OPENMP_FOUND
)
set
(
openmp_libraries
${
OpenMP_CXX_FLAGS
}
)
set
(
openmp_libraries
${
OpenMP_CXX_FLAGS
}
)
...
...
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