From 12230a84828fedbc671f3e51c28e8f660e58f7ad Mon Sep 17 00:00:00 2001 From: Christopher Albert Date: Wed, 25 Dec 2024 09:34:53 +0000 Subject: [PATCH] SuiteSparse, HDF5 --- CMakeLists.txt | 8 +++----- cmake/FindSuiteSparse.cmake | 2 +- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index d238a22..45de201 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -159,7 +159,6 @@ add_library(mephit SHARED ) add_dependencies(mephit LIBNEO MFEM TRIANGLE) target_include_directories(mephit PUBLIC - ${HDF5_INCLUDE_DIRS} ${magfie_include_dir} ${NETCDF_INCLUDES} ${MFEM_INCLUDE_DIRS} @@ -168,10 +167,9 @@ target_include_directories(mephit PUBLIC ) set(MEPHIT_LIBS ${HDF5_tools_lib} - ${HDF5_Fortran_HL_LIBRARIES} - ${HDF5_HL_LIBRARIES} - ${HDF5_Fortran_LIBRARIES} - ${HDF5_LIBRARIES} + hdf5::hdf5 + hdf5::hdf5_fortran + hdf5::hdf5_hl_fortran GSL::gsl ${MFEM_LIBRARIES} BLAS::BLAS diff --git a/cmake/FindSuiteSparse.cmake b/cmake/FindSuiteSparse.cmake index 8564f03..d713f72 100644 --- a/cmake/FindSuiteSparse.cmake +++ b/cmake/FindSuiteSparse.cmake @@ -282,7 +282,7 @@ ELSE (EXISTS ${KLU_LIBRARY}) SET(KLU_FOUND FALSE) ENDIF (EXISTS ${KLU_LIBRARY}) MARK_AS_ADVANCED(KLU_LIBRARY) -FIND_PATH(KLU_INCLUDE_DIR NAMES KLU.h +FIND_PATH(KLU_INCLUDE_DIR NAMES klu.h PATHS ${SUITESPARSE_CHECK_INCLUDE_DIRS}) IF (EXISTS ${KLU_INCLUDE_DIR}) MESSAGE(STATUS "Found KLU header in: ${KLU_INCLUDE_DIR}")