From 4860bdcabc30628eefe66930648b1f9165122f97 Mon Sep 17 00:00:00 2001 From: scivision Date: Sun, 21 Jul 2024 21:30:29 -0400 Subject: [PATCH] correct hDF5 build paths --- cmake/FindHDF5.cmake | 4 ++-- cmake/hdf5.cmake | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/cmake/FindHDF5.cmake b/cmake/FindHDF5.cmake index 2df8d28..c9a4ed6 100644 --- a/cmake/FindHDF5.cmake +++ b/cmake/FindHDF5.cmake @@ -743,10 +743,10 @@ endfunction(check_fortran_links) function(check_hdf5_link) -# HDF5 bug #3663 for HDF5 1.14.2, 1.14.3, ...? +# HDF5 bug #3663 for HDF5 1.14.2, ...? # https://github.com/HDFGroup/hdf5/issues/3663 if(WIN32 AND CMAKE_Fortran_COMPILER_ID MATCHES "^Intel") -if(HDF5_VERSION MATCHES "1.14.[2-3]") +if(HDF5_VERSION MATCHES "1.14.[2-4]") message(VERBOSE "FindHDF5: applying workaround for HDF5 bug #3663 with Intel oneAPI on Windows") list(APPEND CMAKE_REQUIRED_LIBRARIES shlwapi) endif() diff --git a/cmake/hdf5.cmake b/cmake/hdf5.cmake index cd564e4..d1856f9 100644 --- a/cmake/hdf5.cmake +++ b/cmake/hdf5.cmake @@ -18,7 +18,7 @@ foreach(_name IN ITEMS hdf5_hl_fortran hdf5_hl_f90cstub hdf5_fortran hdf5_f90cst # need ${CMAKE_INSTALL_PREFIX}/lib as HDF5 doesn't use GNUInstallDirs if(BUILD_SHARED_LIBS) if(WIN32) - list(APPEND HDF5_LIBRARIES ${CMAKE_INSTALL_PREFIX}/lib/lib${_name}${CMAKE_SHARED_LIBRARY_SUFFIX}) + list(APPEND HDF5_LIBRARIES ${CMAKE_INSTALL_FULL_BINDIR}/lib${_name}${CMAKE_SHARED_LIBRARY_SUFFIX}) else() list(APPEND HDF5_LIBRARIES ${CMAKE_INSTALL_PREFIX}/lib/lib${_name}${CMAKE_SHARED_LIBRARY_SUFFIX}) endif()