Skip to content
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

Experiment adding libhdf5 #157

Closed
wants to merge 11 commits into from
Closed

Experiment adding libhdf5 #157

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
c98216c
Maybe this should build? @willGraham01
samcunliffe Nov 1, 2022
70e6cd7
Add libhdf5-dev to linux build
samcunliffe Nov 1, 2022
d6b443a
Remove unused.
samcunliffe Nov 1, 2022
d5582bf
Merge branch 'experiment-adding-libhdf5' of https://github.com/UCL/TD…
samcunliffe Nov 1, 2022
7489eda
Mose's fix
willGraham01 Nov 4, 2022
1669d03
Mose's fix with me typing correctly
willGraham01 Nov 4, 2022
f39d535
Merge remote-tracking branch 'origin/main' into experiment-adding-lib…
samcunliffe Nov 14, 2022
c390136
brew install hdf5
samcunliffe Nov 14, 2022
b46fc0d
Link explicit HDF5 libraries also for tdms_lib.
samcunliffe Nov 14, 2022
b50a846
Update the MacOS instructions in README.md.
samcunliffe Nov 14, 2022
5172a7e
HDF5 working on Windows build. (#188)
samcunliffe Nov 14, 2022
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
1 change: 0 additions & 1 deletion tdms/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,6 @@ endif()

# Compile options -------------------------------------------------------------
target_compile_options(tdms PUBLIC -DMX_COMPAT_32 -c ${DFLAG} -O3)
target_link_libraries(tdms ${HDF5_CXX_LIBRARIES})

if(CMAKE_CXX_COMPILER_ID STREQUAL "MSVC")
target_compile_options(tdms PRIVATE /W4)
Expand Down
2 changes: 2 additions & 0 deletions tdms/cmake/targets.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ function(release_target)
${Matlab_MX_LIBRARY}
${Matlab_MAT_LIBRARY}
${LIBCXX_LIBRARY}
${HDF5_CXX_LIBRARIES}
OpenMP::OpenMP_CXX
spdlog::spdlog
)
Expand Down Expand Up @@ -44,6 +45,7 @@ function(test_target)
${Matlab_MX_LIBRARY}
${Matlab_MAT_LIBRARY}
${LIBCXX_LIBRARY}
${HDF5_CXX_LIBRARIES}
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

  • the target tdms isn't told to explicitly link to the HDF5 library found during configuration, so the linker just picks up the first one it finds. Adding

      target_link_libraries(tdms ${HDF5_CXX_LIBRARIES})

    should do the trick

Mosè's fix is also needed for the dynlib target (at least on my ARM64 Mac which tries to link the wrong HDF5 libraries).

OpenMP::OpenMP_CXX
spdlog::spdlog
)
Expand Down