correct hDF5 build paths

geospace-code · Jul 22, 2024 · 4860bdc · 4860bdc
1 parent ceac296
commit 4860bdc
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git 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
@@ -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()