Skip to content

Commit

Permalink
Try and downgrade hdf5
Browse files Browse the repository at this point in the history
  • Loading branch information
KerstinKeller committed Jan 31, 2024
1 parent 2843b84 commit b64beb1
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 3 deletions.
3 changes: 2 additions & 1 deletion .github/workflows/build-macos.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ jobs:
target: 'desktop'

- name: Install Dependencies
run: brew install ninja doxygen graphviz protobuf hdf5 pkg-config
run: brew install ninja doxygen graphviz protobuf hdf5@1.10 pkg-config

- name: Install Cap’n Proto
run: |
Expand Down Expand Up @@ -85,6 +85,7 @@ jobs:
-DECAL_THIRDPARTY_BUILD_QWT=ON \
-DECAL_THIRDPARTY_BUILD_YAML-CPP=ON \
-DCMAKE_BUILD_TYPE=Release \
-DCMAKE_PREFIX_PATH=/usr/local/opt/[email protected] \
-DCMAKE_CXX_STANDARD=17 \
-DCMAKE_FIND_PACKAGE_PREFER_CONFIG=ON \
-DPython_FIND_STRATEGY=LOCATION \
Expand Down
11 changes: 9 additions & 2 deletions contrib/ecalhdf5/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,15 @@

project(hdf5 LANGUAGES C CXX)

find_package(HDF5 COMPONENTS C REQUIRED)
find_package(Threads REQUIRED)
if(NOT CMAKE_CROSSCOMPILING)
find_package(HDF5 COMPONENTS C REQUIRED)
find_package(Threads REQUIRED)
else()
find_library(hdf5_path NAMES hdf5 REQUIRED PATH_SUFFIXES hdf5/serial)
find_path(hdf5_include NAMES hdf5.h PATH_SUFFIXES hdf5/serial REQUIRED)
set(HDF5_LIBRARIES "${hdf5_path};m;dl;z;sz;pthread")
set(HDF5_INCLUDE_DIRS "${hdf5_include}")
endif()

set(ecalhdf5_src
src/eh5_meas.cpp
Expand Down

0 comments on commit b64beb1

Please sign in to comment.