Jelajahi Sumber

Merge topic 'hip-windows-clang'

73051ad572 fix: build HIP on Windows with MSVC-style clang-cl.exe

Acked-by: Kitware Robot <[email protected]>
Merge-request: !11663
Brad King 1 Minggu lalu
induk
melakukan
961ed3f2e9

+ 1 - 1
Modules/Platform/Windows-Clang-HIP.cmake

@@ -1,5 +1,5 @@
 include(Platform/Windows-Clang)
 include(Platform/Windows-Clang)
-set(_COMPILE_HIP_MSVC " -TP")
+set(_COMPILE_HIP_MSVC " -x hip")
 __windows_compiler_clang(HIP)
 __windows_compiler_clang(HIP)
 
 
 if("x${CMAKE_HIP_COMPILER_FRONTEND_VARIANT}" STREQUAL "xMSVC")
 if("x${CMAKE_HIP_COMPILER_FRONTEND_VARIANT}" STREQUAL "xMSVC")

+ 4 - 1
Modules/Platform/Windows-MSVC.cmake

@@ -50,6 +50,8 @@ if(NOT MSVC_VERSION)
     set(_compiler_version ${CMAKE_Fortran_SIMULATE_VERSION})
     set(_compiler_version ${CMAKE_Fortran_SIMULATE_VERSION})
   elseif(CMAKE_CUDA_SIMULATE_VERSION)
   elseif(CMAKE_CUDA_SIMULATE_VERSION)
     set(_compiler_version ${CMAKE_CUDA_SIMULATE_VERSION})
     set(_compiler_version ${CMAKE_CUDA_SIMULATE_VERSION})
+  elseif(CMAKE_HIP_SIMULATE_VERSION)
+    set(_compiler_version ${CMAKE_HIP_SIMULATE_VERSION})
   elseif(CMAKE_C_COMPILER_VERSION)
   elseif(CMAKE_C_COMPILER_VERSION)
     set(_compiler_version ${CMAKE_C_COMPILER_VERSION})
     set(_compiler_version ${CMAKE_C_COMPILER_VERSION})
   else()
   else()
@@ -483,7 +485,8 @@ macro(__windows_compiler_msvc lang)
   endif()
   endif()
 
 
   if("x${lang}" STREQUAL "xC" OR
   if("x${lang}" STREQUAL "xC" OR
-      "x${lang}" STREQUAL "xCXX")
+      "x${lang}" STREQUAL "xCXX" OR
+      "x${lang}" STREQUAL "xHIP")
     if(CMAKE_MSVC_RUNTIME_LIBRARY_DEFAULT)
     if(CMAKE_MSVC_RUNTIME_LIBRARY_DEFAULT)
       set(_MDd "")
       set(_MDd "")
       set(_MD "")
       set(_MD "")