Skip to content

Issue 634: add back HDF5_INCLUDE_DIRS into h5cpp.pc #635

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jkotan merged 4 commits into from
May 11, 2023
Merged

Issue 634: add back HDF5_INCLUDE_DIRS into h5cpp.pc #635

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
4c0140b
add HDF5_INCLUDE_DIRS and MPI_CXX_INCLUDE_PATH back
jkotan May 11, 2023
cf60405
update tests to macos 11
jkotan May 11, 2023
3830f11
fix target_link_libraries h5cpp::h5cpp in documentation
jkotan May 11, 2023
16c000b
clean the PR
jkotan May 11, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/cmake-build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -172,7 +172,7 @@ jobs:
.\conanrunenv-release-x86_64.ps1
ctest --extra-verbose --no-tests=error --output-on-failure
shell: pwsh
macos-10:
macos-11:
strategy:
matrix:
shared: ["shared", "static"]
Expand All @@ -181,7 +181,7 @@ jobs:
# "mpi",
"serial"
]
runs-on: macos-10.15
runs-on: macos-11
steps:
- uses: actions/checkout@v2
- uses: actions/setup-python@v2
Expand Down
2 changes: 1 addition & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ find_package(h5cpp REQUIRED)
.
.
add_executable(some_target some_code.cpp)
target_link_libraries(some_target h5cpp)
target_link_libraries(some_target h5cpp::h5cpp)
```
and adding the following:
```cpp
Expand Down
2 changes: 1 addition & 1 deletion doc/source/users_guide/using.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ the following :file:`CMakeLists.txt` fiel is sufficient

find_package(h5cpp REQUIRED)
add_executable(h5cpp_test main.cpp)
target_link_libraries(h5cpp_test h5cpp)
target_link_libraries(h5cpp_test h5cpp::h5cpp)

Despite the C++ language standard all dependencies are provided by
the package file via the imported target.
Expand Down
20 changes: 19 additions & 1 deletion src/h5cpp/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,8 +55,26 @@ else()
endif()
endif()

#
# remove the absolute path from the library name
#
set(H5CPP_INTERFACE_LIBS)
set(H5CPP_PRIVATE_LIBS ${HDF5_LIBRARIES})
foreach(HDF5_LIBRARY ${HDF5_LIBRARIES})
get_filename_component(LIB_NAME ${HDF5_LIBRARY} NAME)
list(APPEND H5CPP_INTERFACE_LIBS ${LIB_NAME})
endforeach()

set(H5CPP_HL_PRIVATE_LIBS ${HDF5_HL_LIBRARIES})
foreach(HDF5_LIBRARY ${HDF5_HL_LIBRARIES})
get_filename_component(LIB_NAME ${HDF5_LIBRARY} NAME)
list(APPEND H5CPP_INTERFACE_LIBS ${LIB_NAME})
endforeach()

target_include_directories(h5cpp
PRIVATE ${PROJECT_SOURCE_DIR}/src
PUBLIC ${HDF5_INCLUDE_DIRS}
PUBLIC ${MPI_CXX_INCLUDE_PATH}
INTERFACE $<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/src>
INTERFACE $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>
)
Expand Down Expand Up @@ -97,7 +115,7 @@ if (TARGET SZIP::SZIP)
endif()

target_link_libraries(h5cpp
PUBLIC
PUBLIC
${H5CPP_LINKS}
hdf5::hdf5
PRIVATE ${COVERAGE_LIBRARIES}
Expand Down