Commit fcf211d9 authored by Davis King's avatar Davis King

merged

parents addb19d3 6a9637ca
...@@ -511,7 +511,7 @@ if (NOT TARGET dlib) ...@@ -511,7 +511,7 @@ 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 (!MSVC) if (NOT MSVC)
set(CUDA_PROPAGATE_HOST_FLAGS OFF) set(CUDA_PROPAGATE_HOST_FLAGS OFF)
endif() endif()
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment