Просмотр исходного кода

NVCC: Avoid requiring NVIDIA trademark to identify the compiler

Fixes: #26805
Brad King 9 месяцев назад
Родитель
Сommit
5ffc9e6c7e

+ 1 - 1
Modules/CMakeDetermineCUDACompiler.cmake

@@ -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")
 

+ 1 - 1
Modules/CMakeDetermineHIPCompiler.cmake

@@ -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")