Merge pull request #3592 from jet47:cuda-7.0-android

pull/3590/merge
Vadim Pisarevsky 10 years ago
commit 60cedd7a68
  1. 2
      cmake/FindCUDA.cmake

@ -1098,7 +1098,7 @@ macro(CUDA_WRAP_SRCS cuda_target format generated_files)
set(nvcc_flags ${nvcc_flags} "--target-cpu-architecture=${CUDA_TARGET_CPU_ARCH}")
endif()
if(CUDA_TARGET_OS_VARIANT)
if(CUDA_TARGET_OS_VARIANT AND CUDA_VERSION VERSION_LESS "7.0")
set(nvcc_flags ${nvcc_flags} "-target-os-variant=${CUDA_TARGET_OS_VARIANT}")
endif()

Loading…
Cancel
Save