Commit 4f527641 authored by Davis E. King's avatar Davis E. King Committed by GitHub

Merge pull request #364 from reunanen/set-cuda-propagate-host-flags-on

Fix Visual Studio build by not setting CUDA_PROPAGATE_HOST_FLAGS to OFF
parents bf36a846 2d23e4dd
...@@ -510,7 +510,10 @@ if (NOT TARGET dlib) ...@@ -510,7 +510,10 @@ 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)
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})
......
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