cmake: use HIP CONFIG on Windows

heroxbd · Sep 1, 2021 · 41491c9 · 41491c9
1 parent 894ea5c
commit 41491c9
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 5 deletions.
diff --git a/clients/rider/CMakeLists.txt b/clients/rider/CMakeLists.txt
@@ -43,7 +43,11 @@ target_include_directories( hipfft-rider
 
 if( NOT CMAKE_CXX_COMPILER MATCHES ".*/hipcc$" )
   if( NOT BUILD_WITH_LIB STREQUAL "CUDA" )
-    find_package( HIP REQUIRED )
+    if( WIN32 )
+      find_package( HIP CONFIG REQUIRED )
+    else()
+      find_package( HIP MODULE REQUIRED )
+    endif()
     target_link_libraries( hipfft-rider PRIVATE hip::host )
   else()
 

diff --git a/clients/samples/CMakeLists.txt b/clients/samples/CMakeLists.txt
@@ -48,7 +48,11 @@ foreach( sample ${sample_list} )
   target_link_libraries( ${sample} PRIVATE hip::hipfft )
 
   if( NOT CMAKE_CXX_COMPILER MATCHES ".*/hipcc$" )
-    find_package( HIP MODULE REQUIRED )
+    if( WIN32 )
+      find_package( HIP CONFIG REQUIRED )
+    else()
+      find_package( HIP MODULE REQUIRED )
+    endif()
     if( NOT BUILD_WITH_LIB STREQUAL "CUDA" )
       target_link_libraries( ${sample} PRIVATE hip::host )
     else()

diff --git a/clients/tests/CMakeLists.txt b/clients/tests/CMakeLists.txt
@@ -81,7 +81,11 @@ endif()
 
 if( NOT CMAKE_CXX_COMPILER MATCHES ".*/hipcc$" )
   if( NOT BUILD_WITH_LIB STREQUAL "CUDA" )
-    find_package( HIP MODULE REQUIRED )
+    if( WIN32 )
+      find_package( HIP CONFIG REQUIRED )
+    else()
+      find_package( HIP MODULE REQUIRED )
+    endif()
     target_link_libraries( hipfft-test PRIVATE hip::host )
   else()
     target_compile_definitions( hipfft-test PRIVATE __HIP_PLATFORM_NVIDIA__)

diff --git a/cmake/dependencies.cmake b/cmake/dependencies.cmake
@@ -27,14 +27,22 @@ find_package(Git REQUIRED)
 # HIP
 if( NOT CMAKE_CXX_COMPILER MATCHES ".*/hipcc$" )
   if( NOT BUILD_WITH_LIB STREQUAL "CUDA" )
-    find_package( HIP REQUIRED )
+    if( WIN32 )
+      find_package( HIP CONFIG REQUIRED )
+    else()
+      find_package( HIP MODULE REQUIRED )
+    endif()
     list( APPEND HIP_INCLUDE_DIRS "${HIP_ROOT_DIR}/include" )
   endif()
 else()
   if( BUILD_WITH_LIB STREQUAL "CUDA" )
     set(HIP_INCLUDE_DIRS "${HIP_ROOT_DIR}/include")
   else()
-    find_package( HIP REQUIRED )
+    if( WIN32 )
+      find_package( HIP CONFIG REQUIRED )
+    else()
+      find_package( HIP MODULE REQUIRED )
+    endif()
   endif()
 endif()