Update more CUDA compiler id checks.

Author: alliepiper

examples/cmake/CMakeLists.txt

@@ -2,14 +2,6 @@ thrust_update_system_found_flags()
 
 set(extra_cmake_flags)
 
-# Need to pass these when testing NVC++.
-if ("NVCXX" STREQUAL "${CMAKE_CUDA_COMPILER_ID}")
-  set(extra_cmake_flags
-    -D "CMAKE_CUDA_COMPILER_ID=${CMAKE_CUDA_COMPILER_ID}"
-    -D "CMAKE_CUDA_COMPILER_FORCED=${CMAKE_CUDA_COMPILER_FORCED}"
-  )
-endif()
-
 if (THRUST_CPP_FOUND AND THRUST_CUDA_FOUND)
   # Do a basic check of the cmake/ThrustAddSubdir.cmake mechanism:
   add_test(

testing/cmake/CMakeLists.txt

@@ -2,14 +2,6 @@ thrust_update_system_found_flags()
 
 set(extra_cmake_flags)
 
-# Need to pass these when testing NVC++.
-if ("NVCXX" STREQUAL "${CMAKE_CUDA_COMPILER_ID}")
-  set(extra_cmake_flags
-    -D "CMAKE_CUDA_COMPILER_ID=${CMAKE_CUDA_COMPILER_ID}"
-    -D "CMAKE_CUDA_COMPILER_FORCED=${CMAKE_CUDA_COMPILER_FORCED}"
-  )
-endif()
-
 if (THRUST_CPP_FOUND AND THRUST_CUDA_FOUND)
   # Test that we can use `find_package` on an installed Thrust:
   add_test(

testing/unittest_static_assert.cmake

@@ -5,6 +5,6 @@ target_link_libraries(${test_target} PRIVATE thrust.silence_unreachable_code_war
 
 # The machinery behind this test is not compatible with NVC++.
 # See https://github.com/NVIDIA/thrust/issues/1397
-if ("NVCXX" STREQUAL "${CMAKE_CUDA_COMPILER_ID}")
+if ("NVHPC" STREQUAL "${CMAKE_CUDA_COMPILER_ID}")
   set_tests_properties(${test_target} PROPERTIES DISABLED True)
 endif()