mirror/vcpkg
1
0
Fork 0
mirror of https://github.com/microsoft/vcpkg.git synced 2025-06-07 19:42:46 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

[vcpkg_fixup_pkgconfig] Remove required in first find_program call for pkg-config (#12569)

Browse Source 
* Remove required in first find_program call

* add usr/local/bin for mac

* lets try without cellar and see if osx ci agrees
This commit is contained in:
Alexander Neumann 2020-07-31 18:20:56 +02:00 committed by GitHub
parent 2b8d5bad0a
commit e299457351
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
scripts/cmake/vcpkg_fixup_pkgconfig.cmake
View File

@ -276,7 +276,7 @@ function(vcpkg_fixup_pkgconfig)
endif() endif()
if(NOT PKGCONFIG) 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) if(NOT PKGCONFIG AND CMAKE_HOST_WIN32)
vcpkg_acquire_msys(MSYS_ROOT PACKAGES pkg-config) vcpkg_acquire_msys(MSYS_ROOT PACKAGES pkg-config)
find_program(PKGCONFIG pkg-config PATHS "${MSYS_ROOT}/usr/bin" REQUIRED) find_program(PKGCONFIG pkg-config PATHS "${MSYS_ROOT}/usr/bin" REQUIRED)