Skip to content

Commit

Permalink
[vcpkg_fixup_pkgconfig] Remove required in first find_program call fo…
Browse files Browse the repository at this point in the history
…r 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
  • Loading branch information
Neumann-A committed Jul 31, 2020
1 parent 2b8d5ba commit e299457
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion scripts/cmake/vcpkg_fixup_pkgconfig.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down

0 comments on commit e299457

Please sign in to comment.