diff options
| author | Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> | 2020-07-31 18:20:56 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-07-31 09:20:56 -0700 |
| commit | e29945735164d0a2595be24cd897a84b64160553 (patch) | |
| tree | 6f11cad85cb17499370a08451772ad4febd813dc /scripts | |
| parent | 2b8d5bad0a1089783f34d3f8f9b85f18b7cbfb0d (diff) | |
| download | vcpkg-e29945735164d0a2595be24cd897a84b64160553.tar.gz vcpkg-e29945735164d0a2595be24cd897a84b64160553.zip | |
[vcpkg_fixup_pkgconfig] Remove required in first find_program call for pkg-config (#12569)
* Remove required in first find_program call
* add usr/local/bin for mac
* lets try without cellar and see if osx ci agrees
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/cmake/vcpkg_fixup_pkgconfig.cmake | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/scripts/cmake/vcpkg_fixup_pkgconfig.cmake b/scripts/cmake/vcpkg_fixup_pkgconfig.cmake index 6b840afe2..24302a6af 100644 --- a/scripts/cmake/vcpkg_fixup_pkgconfig.cmake +++ b/scripts/cmake/vcpkg_fixup_pkgconfig.cmake @@ -276,7 +276,7 @@ function(vcpkg_fixup_pkgconfig) endif() if(NOT PKGCONFIG) - find_program(PKGCONFIG pkg-config PATHS "bin" "/usr/bin" "/usr/local/Cellar/pkg-config/0.29.2_3" REQUIRED) + find_program(PKGCONFIG pkg-config PATHS "bin" "/usr/bin" "/usr/local/bin") if(NOT PKGCONFIG AND CMAKE_HOST_WIN32) vcpkg_acquire_msys(MSYS_ROOT PACKAGES pkg-config) find_program(PKGCONFIG pkg-config PATHS "${MSYS_ROOT}/usr/bin" REQUIRED) |