From 76dadd607523d994d34f39f99de1c215240c68e4 Mon Sep 17 00:00:00 2001 From: Florian Reimold <11774314+FlorianReimold@users.noreply.github.com> Date: Fri, 21 Jul 2023 12:09:01 +0200 Subject: [PATCH] changed hdf5 submodule again and set CMAKE_FIND_PACKAGE_PREFER_CONFIG --- .github/workflows/build-macos.yml | 2 +- thirdparty/hdf5 | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build-macos.yml b/.github/workflows/build-macos.yml index 2cd21a625c..35fdd97d8f 100644 --- a/.github/workflows/build-macos.yml +++ b/.github/workflows/build-macos.yml @@ -85,8 +85,8 @@ jobs: -DECAL_THIRDPARTY_BUILD_QWT=ON \ -DECAL_THIRDPARTY_BUILD_YAML-CPP=ON \ -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_PREFIX_PATH=/usr/local/opt/protobuf@21 \ -DCMAKE_CXX_STANDARD=17 \ + -DCMAKE_FIND_PACKAGE_PREFER_CONFIG=ON \ -DPython_FIND_STRATEGY=LOCATION \ -DPython_FIND_REGISTRY=NEVER sudo mkdir /etc/ecal diff --git a/thirdparty/hdf5 b/thirdparty/hdf5 index 1d90890a7b..02209bc35c 160000 --- a/thirdparty/hdf5 +++ b/thirdparty/hdf5 @@ -1 +1 @@ -Subproject commit 1d90890a7b38834074169ce56720b7ea7f4b01ae +Subproject commit 02209bc35c83f6b9b6740b104f6719be78234b7d