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

60cedd7a · Vadim Pisarevsky · bc23f29b · d8272b93 · 60cedd7a
Commit 60cedd7a authored Jan 13, 2015 by Vadim Pisarevsky
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

FindCUDA.cmake cmake/FindCUDA.cmake +1 -1

No files found.
--- a/cmake/FindCUDA.cmake
+++ b/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()