Merge topic 'nvcc-options-version'

7560c68f2c CUDA: Fix compiler option version checks for nvcc 10.2.19

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Robert Maynard <robert.maynard@kitware.com>
Merge-request: !4161
This commit is contained in:
Brad King 2020-01-10 18:53:58 +00:00 committed by Kitware Robot
commit 75e109a5b3

View File

@ -4,7 +4,7 @@ set(CMAKE_CUDA_COMPILER_HAS_DEVICE_LINK_PHASE True)
set(CMAKE_CUDA_VERBOSE_FLAG "-v")
set(CMAKE_CUDA_VERBOSE_COMPILE_FLAG "-Xcompiler=-v")
if (NOT CMAKE_CUDA_COMPILER_VERSION VERSION_LESS 10.2)
if (CMAKE_CUDA_COMPILER_VERSION VERSION_GREATER_EQUAL 10.2.89)
# The -forward-unknown-to-host-compiler flag was only
# added to nvcc in 10.2 so before that we had no good
# way to invoke the CUDA compiler and propagate unknown
@ -20,7 +20,7 @@ else()
set(_CMAKE_CUDA_EXTRA_DEVICE_LINK_FLAGS "")
endif()
if (NOT CMAKE_CUDA_COMPILER_VERSION VERSION_LESS 10.2)
if (CMAKE_CUDA_COMPILER_VERSION VERSION_GREATER_EQUAL 10.2.89)
# The -MD flag was only added to nvcc in 10.2 so
# before that we had to invoke the compiler twice
# to get header dependency information