Skip to content

Commit 0a1a4b1

Browse files
committed
Upgraded dependencies
1 parent 4e48daf commit 0a1a4b1

3 files changed

Lines changed: 12 additions & 24 deletions

File tree

.github/workflows/main.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ jobs:
2121
steps:
2222

2323
- name: Checkout code
24-
uses: actions/checkout@v3
24+
uses: actions/checkout@v4
2525

2626
- name: Set conda environment
2727
uses: mamba-org/setup-micromamba@main
@@ -30,7 +30,7 @@ jobs:
3030
environment-file: environment-dev.yml
3131

3232
- name: Configure using CMake
33-
run: cmake -G Ninja -Bbuild -DCMAKE_INSTALL_PREFIX=$CONDA_PREFIX -DDOWNLOAD_GTEST=ON -DHAVE_ALL_DEPS=ON
33+
run: cmake -G Ninja -Bbuild -DCMAKE_PREFIX_PATH=$CONDA_PREFIX -DCMAKE_INSTALL_PREFIX=$CONDA_PREFIX -DDOWNLOAD_GTEST=ON -DHAVE_ALL_DEPS=ON
3434

3535
- name: Generate data for zlib test
3636
working-directory: build/test

CMakeLists.txt

Lines changed: 5 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -197,18 +197,8 @@ endif()
197197

198198
if(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}
211-
)
200+
message(STATUS "HighFive ${HighFive_VERSION} found, HDF5 file support enabled")
201+
target_link_libraries(xtensor-io INTERFACE HighFive::HighFive)
212202
else()
213203
message(STATUS "HighFive not enabled: use -DHAVE_HighFive=ON for HDF5 file support")
214204
endif()
@@ -245,15 +235,11 @@ else()
245235
endif()
246236

247237
if(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-
)
238+
find_package(google_cloud_cpp_storage REQUIRED)
239+
message(STATUS "google_cloud_cpp_storage ${google_cloud_cpp_storage_VERSION} found, Google Cloud Storage IO handler support enabled")
254240
target_link_libraries(xtensor-io
255241
INTERFACE
256-
storage_client
242+
google-cloud-cpp::storage
257243
)
258244
else()
259245
message(STATUS "storage_client not enabled: use -DHAVE_storage_client=ON for Google Cloud Storage IO handler support")

test/downloadGTest.cmake.in

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,16 @@
77
# The full license is in the file LICENSE, distributed with this software. #
88
############################################################################
99

10-
cmake_minimum_required(VERSION 2.8.2)
10+
cmake_minimum_required(VERSION 3.30)
1111

1212
project(googletest-download NONE)
1313

1414
include(ExternalProject)
1515
ExternalProject_Add(googletest
16-
GIT_REPOSITORY https://github.com/JohanMabille/googletest.git
17-
GIT_TAG warnings
16+
#GIT_REPOSITORY https://github.com/JohanMabille/googletest.git
17+
GIT_REPOSITORY https://github.com/google/googletest.git
18+
#GIT_TAG warnings
19+
GIT_TAG v1.15.2
1820
SOURCE_DIR "${CMAKE_CURRENT_BINARY_DIR}/googletest-src"
1921
BINARY_DIR "${CMAKE_CURRENT_BINARY_DIR}/googletest-build"
2022
CONFIGURE_COMMAND ""

0 commit comments

Comments
 (0)