Skip to content

D
dlib
Commit 6bdfe3cd authored by Davis King's avatar Davis King
Browse files
Options

Make sure -DDLIB__CMAKE_GENERATED_A_CONFIG_H_FILE is propagated to nvcc so that 

the odr violation checks don't erroneously trigger.
parent 5fe116d2
Hide whitespace changes
Inline Side-by-side
Showing with 3 additions and 0 deletions
dlib/CMakeLists.txt
View file @ 6bdfe3cd
...@@ -601,6 +601,9 @@ if (NOT TARGET dlib) ...@@ -601,6 +601,9 @@ if (NOT TARGET dlib)
# linux). # linux).
list(APPEND CUDA_NVCC_FLAGS "-arch=sm_30;-D__STRICT_ANSI__;-D_MWAITXINTRIN_H_INCLUDED;-D_FORCE_INLINES;${FLAGS_FOR_NVCC}") list(APPEND CUDA_NVCC_FLAGS "-arch=sm_30;-D__STRICT_ANSI__;-D_MWAITXINTRIN_H_INCLUDED;-D_FORCE_INLINES;${FLAGS_FOR_NVCC}")
list(APPEND CUDA_NVCC_FLAGS ${active_preprocessor_switches}) list(APPEND CUDA_NVCC_FLAGS ${active_preprocessor_switches})
if (NOT DLIB_IN_PROJECT_BUILD)
LIST(APPEND CUDA_NVCC_FLAGS -DDLIB__CMAKE_GENERATED_A_CONFIG_H_FILE)
endif()
if (NOT MSVC) if (NOT MSVC)
list(APPEND CUDA_NVCC_FLAGS "-std=c++11") list(APPEND CUDA_NVCC_FLAGS "-std=c++11")
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