summaryrefslogtreecommitdiffstats
path: root/.github
diff options
context:
space:
mode:
authorDimitrios Apostolou <jimis@qt.io>2020-06-30 14:24:34 +0200
committerDimitrios Apostolou <jimis@qt.io>2020-06-30 15:21:14 +0200
commit31ae43f87577bea7fe66ad1ba9af0239c7699958 (patch)
tree2f0ea20c0cbac782505493bca1ab0dcab016faec /.github
parent04e1ae2308b9e5da9bc6f65ce3c9bcc3bd4b9c96 (diff)
Install and enable pkg-config on macOS
Needed after commit f3c7d22dd04afe8d889585fb5d6426f3d4591e74 that caused CMake to not search libraries under /usr/local. Change-Id: Ic10925e1c6ee941e7a58a3a219be3d659d3b2fb5 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Diffstat (limited to '.github')
-rw-r--r--.github/workflows/ninja-build.yml5
1 files changed, 3 insertions, 2 deletions
diff --git a/.github/workflows/ninja-build.yml b/.github/workflows/ninja-build.yml
index b333e9f27a..5b28a8c5d3 100644
--- a/.github/workflows/ninja-build.yml
+++ b/.github/workflows/ninja-build.yml
@@ -31,9 +31,10 @@ jobs:
- name: macos-10.15
os: macos-10.15
deps: jpeg sqlite
- tools: ninja ccache
+ tools: ninja ccache pkg-config
install_cmd: brew install
- cmake_flags: -DFEATURE_system_sqlite=ON
+ # Specifically on macOS pkg_config has to be manually turned on otherwise libraries under /usr/local are not detected.
+ cmake_flags: -DFEATURE_system_sqlite=ON -DFEATURE_pkg_config=ON
- name: windows-2019
os: windows-2019
install_cmd: choco install