Merge branch 'master' into cuda-buildsystem-fix

fix merge conflict
build system improvements
2024-10-01 16:54:53 -07:00 · 2024-09-13 08:57:35 -07:00 · 2024-07-25 17:19:54 -07:00
2 changed files with 8 additions and 5 deletions
@@ -147,8 +147,8 @@ if (MFEM_USE_CUDA)
   find_package(CUDAToolkit REQUIRED)
   set(CUSPARSE_FOUND TRUE)
   set(CUBLAS_FOUND TRUE)
-   get_target_property(CUSPARSE_LIBRARIES CUDA::cusparse LOCATION)
-   get_target_property(CUBLAS_LIBRARIES CUDA::cublas LOCATION)
+   set(CUSPARSE_LIBRARIES CUDA::cusparse)
+   set(CUBLAS_LIBRARIES CUDA::cublas)
 endif()

 if (XSDK_ENABLE_C)
@@ -77,9 +77,12 @@ endif()

 if (HYPRE_FOUND AND HYPRE_USING_CUDA)
  find_package(CUDAToolkit REQUIRED)
-  get_target_property(CUSPARSE_LIBRARIES CUDA::cusparse LOCATION)
-  get_target_property(CURAND_LIBRARIES CUDA::curand LOCATION)
-  get_target_property(CUBLAS_LIBRARIES CUDA::cublas LOCATION)
+  set(CUSPARSE_FOUND TRUE)
+  set(CURAND_FOUND TRUE)
+  set(CUBLAS_FOUND TRUE)
+  set(CUSPARSE_LIBRARIES CUDA::cusparse)
+  set(CURAND_LIBRARIES CUDA::curand)
+  set(CUBLAS_LIBRARIES CUDA::cublas)
  list(APPEND HYPRE_LIBRARIES ${CUSPARSE_LIBRARIES} ${CURAND_LIBRARIES}
       ${CUBLAS_LIBRARIES})
  set(HYPRE_LIBRARIES ${HYPRE_LIBRARIES} CACHE STRING
Author	SHA1	Message	Date
Daniel Taller	b0da860c19	Merge branch 'master' into cuda-buildsystem-fix	2024-10-01 16:54:53 -07:00
Daniel Taller	a61b059e2d	fix merge conflict	2024-09-13 08:57:35 -07:00
Daniel Taller	17f0731f86	build system improvements	2024-07-25 17:19:54 -07:00