diff options
| author | Brad King <brad.king@kitware.com> | 2020-01-10 18:53:58 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2020-01-10 18:54:16 (GMT) |
| commit | 75e109a5b304ed502894f5e0ea791b327f6d1963 (patch) | |
| tree | 59757f7ea3635245966f05d2b0d32d5a10fb41ea /Modules | |
| parent | cf79034450f8ec5eb766e318075bbb8a64381326 (diff) | |
| parent | 7560c68f2c286e6cfcf0acad3b436c2122a9f4e6 (diff) | |
| download | CMake-75e109a5b304ed502894f5e0ea791b327f6d1963.zip CMake-75e109a5b304ed502894f5e0ea791b327f6d1963.tar.gz CMake-75e109a5b304ed502894f5e0ea791b327f6d1963.tar.bz2 | |
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
Diffstat (limited to 'Modules')
| -rw-r--r-- | Modules/Compiler/NVIDIA-CUDA.cmake | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Modules/Compiler/NVIDIA-CUDA.cmake b/Modules/Compiler/NVIDIA-CUDA.cmake index ad7f084..fb1fc20 100644 --- a/Modules/Compiler/NVIDIA-CUDA.cmake +++ b/Modules/Compiler/NVIDIA-CUDA.cmake @@ -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 |