@@ -197,17 +197,8 @@ endif()
197197
198198if (HAVE_HighFive)
199199 find_package (HighFive REQUIRED )
200- find_package (HDF5 REQUIRED )
201- message (STATUS "HighFive ${HighFive_VERSION} and HDF5 ${HDF5_VERSION} found, HDF5 file support enabled" )
202- find_package (HDF5 REQUIRED )
203- get_target_property (HighFive_INCLUDE_DIRECTORIES_EXTRACTED HighFive INTERFACE_INCLUDE_DIRECTORIES )
204- target_include_directories (xtensor-io
205- INTERFACE
206- ${HighFive_INCLUDE_DIRECTORIES_EXTRACTED}
207- )
208- target_link_libraries (xtensor-io
209- INTERFACE
210- ${HDF5_LIBRARIES}
200+ message (STATUS "HighFive ${HighFive_VERSION} found, HDF5 file support enabled" )
201+ target_link_libraries (xtensor-io INTERFACE HighFive::HighFive )
211202 )
212203else ()
213204 message (STATUS "HighFive not enabled: use -DHAVE_HighFive=ON for HDF5 file support" )
@@ -245,15 +236,11 @@ else()
245236endif ()
246237
247238if (HAVE_storage_client)
248- find_package (storage_client REQUIRED )
249- message (STATUS "storage_client ${storage_client_VERSION} found, Google Cloud Storage IO handler support enabled" )
250- target_include_directories (xtensor-io
251- INTERFACE
252- ${storage_client_INCLUDE_DIRS}
253- )
239+ find_package (google_cloud_cpp_storage REQUIRED )
240+ message (STATUS "google_cloud_cpp_storage ${google_cloud_cpp_storage_VERSION} found, Google Cloud Storage IO handler support enabled" )
254241 target_link_libraries (xtensor-io
255242 INTERFACE
256- storage_client
243+ google-cloud-cpp::storage
257244 )
258245else ()
259246 message (STATUS "storage_client not enabled: use -DHAVE_storage_client=ON for Google Cloud Storage IO handler support" )
0 commit comments