diff options
| author | Kyle Edwards <kyle.edwards@kitware.com> | 2019-08-13 13:55:50 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2019-08-13 13:56:47 (GMT) |
| commit | dabd16926b52d9bd3ddb96edc515ff7ce7f1b4d5 (patch) | |
| tree | b9cdecdc1d2ab007f5b628b5ea27497702f490f6 /Modules | |
| parent | f952d9c2573cd243e89f466ec79e9b7dbad9fd06 (diff) | |
| parent | a233e4e7d9c157cae0098762d8a7add463fb3492 (diff) | |
| download | CMake-dabd16926b52d9bd3ddb96edc515ff7ce7f1b4d5.zip CMake-dabd16926b52d9bd3ddb96edc515ff7ce7f1b4d5.tar.gz CMake-dabd16926b52d9bd3ddb96edc515ff7ce7f1b4d5.tar.bz2 | |
Merge topic 'cuda_separable_compilation_determined_by_compiler_id'
a233e4e7d9 CUDA: Compilers can now state they don't require a device linking step
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3659
Diffstat (limited to 'Modules')
| -rw-r--r-- | Modules/CMakeCUDAInformation.cmake | 3 | ||||
| -rw-r--r-- | Modules/Compiler/NVIDIA-CUDA.cmake | 1 |
2 files changed, 3 insertions, 1 deletions
diff --git a/Modules/CMakeCUDAInformation.cmake b/Modules/CMakeCUDAInformation.cmake index 43ae989..b0d80d1 100644 --- a/Modules/CMakeCUDAInformation.cmake +++ b/Modules/CMakeCUDAInformation.cmake @@ -171,7 +171,8 @@ if(NOT CMAKE_CUDA_LINK_EXECUTABLE) "<CMAKE_CUDA_HOST_LINK_LAUNCHER> <LINK_FLAGS> <OBJECTS> -o <TARGET> <LINK_LIBRARIES>${__IMPLICT_LINKS}") endif() -if(CMAKE_CUDA_COMPILER_VERSION VERSION_GREATER_EQUAL "8.0.0") +if( CMAKE_CUDA_COMPILER_ID STREQUAL "NVIDIA" AND + CMAKE_CUDA_COMPILER_VERSION VERSION_GREATER_EQUAL "8.0.0") set(_CMAKE_CUDA_EXTRA_DEVICE_LINK_FLAGS "-Wno-deprecated-gpu-targets") else() set(_CMAKE_CUDA_EXTRA_DEVICE_LINK_FLAGS "") diff --git a/Modules/Compiler/NVIDIA-CUDA.cmake b/Modules/Compiler/NVIDIA-CUDA.cmake index c0ccb71..b59deda 100644 --- a/Modules/Compiler/NVIDIA-CUDA.cmake +++ b/Modules/Compiler/NVIDIA-CUDA.cmake @@ -1,3 +1,4 @@ +set(CMAKE_CUDA_COMPILER_HAS_DEVICE_LINK_PHASE True) set(CMAKE_CUDA_VERBOSE_FLAG "-v") set(CMAKE_CUDA_VERBOSE_COMPILE_FLAG "-Xcompiler=-v") |