diff options
| author | Brad King <brad.king@kitware.com> | 2023-09-26 13:40:18 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2023-09-26 13:40:25 (GMT) |
| commit | 5d32320bf33bc874d0f0e0c651235fe6472c8013 (patch) | |
| tree | 92b397f5d36a1ea9998ac125eac7c5de5487766b /Modules/Compiler | |
| parent | ccd53590033a32f02319ec09d2cf5e8c11c7e62c (diff) | |
| parent | fd982eec10840eabcccc1920c7c32eb0a13d65a9 (diff) | |
| download | CMake-5d32320bf33bc874d0f0e0c651235fe6472c8013.zip CMake-5d32320bf33bc874d0f0e0c651235fe6472c8013.tar.gz CMake-5d32320bf33bc874d0f0e0c651235fe6472c8013.tar.bz2 | |
Merge topic 'hip-nvidia'
fd982eec10 HIP: Add tests for special NVIDIA values of CMAKE_HIP_ARCHITECTURES
8c8b3f1bfa HIP: Fix support for -DCMAKE_HIP_ARCHITECTURES=native with NVCC
b3e92775ab HIP: Add CMAKE_HIP_HOST_COMPILER when compiler is NVCC
e43918b4ca HIP: Fix linking mixed-lang binary with CXX compiler and Makefile generators
4794505122 HIP: Do not require hip-lang package for NVIDIA platform
09d759dc7f HIP: Simplify exclusion of AMD device runtime with NVIDIA GPUs
2a60663670 HIP: Simplify CMAKE_GENERATOR references for determining compiler
8124950f6c CUDA: Generalize CMAKE_{CUDA => <LANG>}_HOST_COMPILER variable docs
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !8836
Diffstat (limited to 'Modules/Compiler')
| -rw-r--r-- | Modules/Compiler/NVIDIA-HIP.cmake | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/Modules/Compiler/NVIDIA-HIP.cmake b/Modules/Compiler/NVIDIA-HIP.cmake index e144ff8..c888bc7 100644 --- a/Modules/Compiler/NVIDIA-HIP.cmake +++ b/Modules/Compiler/NVIDIA-HIP.cmake @@ -2,10 +2,8 @@ include(Compiler/NVIDIA) __compiler_nvidia_cxx_standards(HIP) __compiler_nvidia_cuda_flags(HIP) -# The ROCm hip-lang package does not work for nvcc, -# so provide a minimal one ourselves. -add_library(hip-lang::device INTERFACE IMPORTED) -set(_CMAKE_HIP_DEVICE_RUNTIME_TARGET hip-lang::device) +# The ROCm hip-lang cmake package's device runtime library is not needed for NVIDIA GPUs. +set(_CMAKE_HIP_DEVICE_RUNTIME_TARGET "") set(CMAKE_HIP_STANDARD_INCLUDE_DIRECTORIES "${CMAKE_HIP_COMPILER_ROCM_ROOT}/include") |