Skip to content

Commit

Permalink
Merge pull request #926 from paulromano/hdf5-transitive-dependencies
Browse files Browse the repository at this point in the history
Do not link against several transitive dependencies of HDF5
  • Loading branch information
gonuke authored Dec 5, 2023
2 parents 8b98988 + 65fbe97 commit 1186825
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 0 deletions.
2 changes: 2 additions & 0 deletions cmake/FindMOAB.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,8 @@ include(${MOAB_CMAKE_CONFIG})
set(ENV{PATH} "${HDF5_DIR}:$ENV{PATH}")
set(CMAKE_FIND_LIBRARY_SUFFIXES ${CMAKE_SHARED_LIBRARY_SUFFIX})
find_package(HDF5 REQUIRED)
# Remove HDF5 transitive dependencies that are system libraries
list(FILTER HDF5_LIBRARIES EXCLUDE REGEX ".*lib(pthread|dl|m).*")
set(HDF5_LIBRARIES_SHARED ${HDF5_LIBRARIES})
# CMake doesn't let you find_package(HDF5) twice so we have to do this instead
if (BUILD_STATIC_LIBS)
Expand Down
1 change: 1 addition & 0 deletions doc/CHANGELOG.rst
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@ Next version
* Tweak conda environment for Windows build to avoid conflicting gtest headers (#888)
* Restrict cython version for MOAB (#893)
* Various documentation updates (#869)
* Fix for HDF5 library linking issue (#926)

v3.2.2
====================
Expand Down

0 comments on commit 1186825

Please sign in to comment.