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
a4470b0e
Commit
a4470b0e
authored
Jan 06, 2017
by
Davis King
Browse files
Only turn off CUDA_PROPAGATE_HOST_FLAGS on OS X since that's the only place
that really needs it off.
parent
365dfd20
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
4 additions
and
4 deletions
+4
-4
dlib/CMakeLists.txt
dlib/CMakeLists.txt
+4
-4
No files found.
dlib/CMakeLists.txt
View file @
a4470b0e
...
@@ -519,13 +519,13 @@ if (NOT TARGET dlib)
...
@@ -519,13 +519,13 @@ if (NOT TARGET dlib)
# -std=c++11 option if you let it propagate it to nvcc in some
# -std=c++11 option if you let it propagate it to nvcc in some
# cases. So instead we disable this and manually include
# cases. So instead we disable this and manually include
# things from CMAKE_CXX_FLAGS in the CUDA_NVCC_FLAGS list below.
# things from CMAKE_CXX_FLAGS in the CUDA_NVCC_FLAGS list below.
if
(
NOT MSVC
)
if
(
APPLE
)
set
(
CUDA_PROPAGATE_HOST_FLAGS OFF
)
set
(
CUDA_PROPAGATE_HOST_FLAGS OFF
)
endif
()
# Grab all the -D flags from CMAKE_CXX_FLAGS so we can pass them
# Grab all the -D flags from CMAKE_CXX_FLAGS so we can pass them
# to nvcc.
# to nvcc.
string
(
REGEX MATCHALL
"-D[^ ]*"
FLAGS_FOR_NVCC
${
CMAKE_CXX_FLAGS
}
)
string
(
REGEX MATCHALL
"-D[^ ]*"
FLAGS_FOR_NVCC
${
CMAKE_CXX_FLAGS
}
)
endif
()
set
(
CUDA_HOST_COMPILATION_CPP ON
)
set
(
CUDA_HOST_COMPILATION_CPP ON
)
# Note that we add __STRICT_ANSI__ to avoid freaking out nvcc with gcc specific
# Note that we add __STRICT_ANSI__ to avoid freaking out nvcc with gcc specific
...
...
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