From 88ae9fcbab45c5c1285e303967381a99214dc548 Mon Sep 17 00:00:00 2001 From: Tobias Hienzsch Date: Tue, 16 Jul 2024 06:59:48 +0200 Subject: [PATCH] Use brew for hdf5 on macOS --- .github/workflows/build.yml | 2 +- conanfile.py | 5 +---- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index e99b4f8..1ab4683 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -74,7 +74,7 @@ jobs: - name: Install dependencies (macOS) if: runner.os == 'macOS' - run: brew install conan libomp llvm ninja opencv tbb + run: brew install conan hdf5 libomp llvm ninja opencv tbb - name: Install dependencies (Windows) if: runner.os == 'Windows' diff --git a/conanfile.py b/conanfile.py index 3af34e8..b53702e 100644 --- a/conanfile.py +++ b/conanfile.py @@ -8,15 +8,12 @@ class NeoFDTD(ConanFile): def requirements(self): self.requires("cli11/2.4.2") self.requires("fmt/11.0.1") - self.requires("hdf5/1.14.4.3") if self.settings.os != "Macos": + self.requires("hdf5/1.14.4.3") self.requires("opencv/4.10.0") def config_options(self): - if self.settings.os == "Macos": - self.options["hdf5"].with_zlib = False - self.options["opencv"].calib3d = False self.options["opencv"].dnn = False self.options["opencv"].features2d = False