mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-02-05 22:59:43 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge topic 'nvcc-compiler-id-vendor'

Browse Source 
5ffc9e6c7e NVCC: Avoid requiring NVIDIA trademark to identify the compiler

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !10521
This commit is contained in:
Brad King
2025-03-26 13:14:39 +00:00
committed by Kitware Robot
parent cd9ed89ff0 5ffc9e6c7e
commit d6cf242647
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Modules/CMakeDetermineCUDACompiler.cmake
View File

@@ -70,7 +70,7 @@ if(NOT CMAKE_CUDA_COMPILER_ID_RUN)
# We determine the vendor to help with find the toolkit and use the right flags for detection right away.
# The main compiler identification is still needed below to extract other information.
list(APPEND CMAKE_CUDA_COMPILER_ID_VENDORS NVIDIA Clang)
set(CMAKE_CUDA_COMPILER_ID_VENDOR_REGEX_NVIDIA "nvcc: NVIDIA \\(R\\) Cuda compiler driver")
set(CMAKE_CUDA_COMPILER_ID_VENDOR_REGEX_NVIDIA "nvcc: [^\n]+ Cuda compiler driver")
set(CMAKE_CUDA_COMPILER_ID_VENDOR_REGEX_Clang "(clang version)")
CMAKE_DETERMINE_COMPILER_ID_VENDOR(CUDA "--version")

2
Modules/CMakeDetermineHIPCompiler.cmake
View File

@@ -90,7 +90,7 @@ if(NOT CMAKE_HIP_COMPILER_ID_RUN)
# We determine the vendor to use the right flags for detection right away.
# The main compiler identification is still needed below to extract other information.
list(APPEND CMAKE_HIP_COMPILER_ID_VENDORS NVIDIA Clang)
set(CMAKE_HIP_COMPILER_ID_VENDOR_REGEX_NVIDIA "nvcc: NVIDIA \\(R\\) Cuda compiler driver")
set(CMAKE_HIP_COMPILER_ID_VENDOR_REGEX_NVIDIA "nvcc: [^\n]+ Cuda compiler driver")
set(CMAKE_HIP_COMPILER_ID_VENDOR_REGEX_Clang "(clang version)")
CMAKE_DETERMINE_COMPILER_ID_VENDOR(HIP "--version")