Minimal set of changes to enable building with LLVM flang. (#198)

ROCm · Nov 9, 2024 · 50a1d08 · 50a1d08
1 parent 7b414a4
commit 50a1d08
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -107,15 +107,15 @@ ENDIF(NOT DEFINED CMAKE_Fortran_COMPILER_SUPPORTS_F08)
 #OPTION(USE_MPI "Use the MPI library for parallelization" OFF)
 #OPTION(USE_OPENMP "Use OpenMP for parallelization" OFF)
 
-IF(CMAKE_Fortran_COMPILER_ID MATCHES "Cray")
+IF(CMAKE_Fortran_COMPILER_ID MATCHES "(Cray|LLVMFlang)")
   set(CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} ${HIPFORT_COMPILER_FLAGS}")
-ELSE(CMAKE_Fortran_COMPILER_ID MATCHES "Cray")
+ELSE(CMAKE_Fortran_COMPILER_ID MATCHES "(Cray|LLVMFlang)")
 IF(CMAKE_Fortran_COMPILER_SUPPORTS_F08)
   set(CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} ${HIPFORT_COMPILER_FLAGS} -std=f2008")
 ELSE(CMAKE_Fortran_COMPILER_SUPPORTS_F08)
   set(CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} ${HIPFORT_COMPILER_FLAGS} -std=f2003")
 ENDIF(CMAKE_Fortran_COMPILER_SUPPORTS_F08)
-ENDIF(CMAKE_Fortran_COMPILER_ID MATCHES "Cray")
+ENDIF(CMAKE_Fortran_COMPILER_ID MATCHES "(Cray|LLVMFlang)")
 
 # Set compile flags for DEBUG, # RELEASE, or TESTING.  
 INCLUDE(${CMAKE_MODULE_PATH}/SetFortranFlags.cmake) 

diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt
@@ -196,7 +196,7 @@ if(HIP_PLATFORM STREQUAL "amd")
 
   find_package(hipsparse PATHS ${ROCM_PATH} /opt/rocm)
   if(hipsparse_FOUND)
-    hipfort_add_component(hipsparse hip::hipsparse)
+    hipfort_add_component(hipsparse roc::hipsparse)
   else()
     message(STATUS "Skipping hipfort::hipsparse target export")
   endif()