From 170486ef27a6db913e9c5f630bd590ecf54acfef Mon Sep 17 00:00:00 2001 From: Gauthier Quesnel Date: Tue, 2 Jul 2024 13:45:06 +0200 Subject: [PATCH] macos: fix pkgconfig environment variable --- .github/workflows/macos.yml | 4 +++- CMakeLists.txt | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml index ce39804..50cc76c 100644 --- a/.github/workflows/macos.yml +++ b/.github/workflows/macos.yml @@ -19,7 +19,7 @@ jobs: steps: - name: Checkout repository and submodule - uses: actions/checkout@v2 + uses: actions/checkout@v4 with: submodules: recursive @@ -27,6 +27,8 @@ jobs: run: brew install expat fmt - name: Configure CMake + env: + PKG_CONFIG_PATH: '/opt/homebrew/opt/expat/lib/pkgconfig' run: cmake -B ${{github.workspace}}/build -DCMAKE_BUILD_TYPE=${{matrix.BUILD_TYPE}} - name: Build diff --git a/CMakeLists.txt b/CMakeLists.txt index 9a15587..ff35830 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -11,7 +11,7 @@ if (UNIX) set(BUILD_SHARED_LIBS ON) endif() -find_package(expat CONFIG REQUIRED) +find_package(EXPAT CONFIG REQUIRED) find_package(fmt CONFIG REQUIRED) find_package(Threads REQUIRED)