Skip to content

Commit

Permalink
Revert partially
Browse files Browse the repository at this point in the history
  • Loading branch information
tbeu committed Mar 30, 2024
1 parent 95b802e commit 6b06464
Showing 1 changed file with 4 additions and 6 deletions.
10 changes: 4 additions & 6 deletions cmake/thirdParties.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,8 @@ if(MATIO_WITH_HDF5)
REQUIRES ${MATIO_CONAN_REQUIRES}
BASIC_SETUP CMAKE_TARGETS
OPTIONS hdf5:shared=True zlib:shared=True
BUILD missing)
BUILD missing
)
endif()
set(HDF5_FOUND TRUE)
else()
Expand Down Expand Up @@ -60,12 +61,9 @@ if(HDF5_FOUND)
elseif(TARGET hdf5)
# target from hdf5 1.8 config
target_link_libraries(MATIO::HDF5 INTERFACE hdf5)
elseif(TARGET hdf5::hdf5-shared)
# target defined in CMake FindHDF5 (since 3.19)
target_link_libraries(MATIO::HDF5 INTERFACE hdf5::hdf5-shared)
elseif(TARGET hdf5::hdf5-static)
elseif(TARGET HDF5::HDF5)
# target defined in CMake FindHDF5 (since 3.19)
target_link_libraries(MATIO::HDF5 INTERFACE hdf5-static)
target_link_libraries(MATIO::HDF5 INTERFACE HDF5::HDF5)
else()
# results from CMake FindHDF5
set_target_properties(MATIO::HDF5 PROPERTIES
Expand Down

0 comments on commit 6b06464

Please sign in to comment.