diff options
| author | ras0219 <533828+ras0219@users.noreply.github.com> | 2020-08-18 12:16:39 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-08-18 12:16:39 -0700 |
| commit | bc8807963282a6b01f0e7ba94b732c5ec028d6a1 (patch) | |
| tree | c9030dd0b438fcb6f4ddc02294f577b3a271e3e4 /scripts/cmake/vcpkg_configure_make.cmake | |
| parent | 739209b51aaa125a41919f23206c110e79023ce8 (diff) | |
| download | vcpkg-bc8807963282a6b01f0e7ba94b732c5ec028d6a1.tar.gz vcpkg-bc8807963282a6b01f0e7ba94b732c5ec028d6a1.zip | |
[vcpkg_find_acquire_program] Enable find_acquire(PKGCONFIG) (#12626)
Co-authored-by: Robert Schumacher <roschuma@microsoft.com>
Co-authored-by: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com>
Diffstat (limited to 'scripts/cmake/vcpkg_configure_make.cmake')
| -rw-r--r-- | scripts/cmake/vcpkg_configure_make.cmake | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/scripts/cmake/vcpkg_configure_make.cmake b/scripts/cmake/vcpkg_configure_make.cmake index 52000e36d..05a0ddfea 100644 --- a/scripts/cmake/vcpkg_configure_make.cmake +++ b/scripts/cmake/vcpkg_configure_make.cmake @@ -413,16 +413,7 @@ function(vcpkg_configure_make) endif()
endif()
- if(NOT ENV{PKG_CONFIG})
- find_program(PKGCONFIG pkg-config PATHS "${MSYS_ROOT}/usr/bin" REQUIRED)
- debug_message("Using pkg-config from: ${PKGCONFIG}")
- if(NOT PKGCONFIG)
- message(STATUS "${PORT} requires pkg-config from the system package manager (example: \"sudo apt-get install pkg-config\")")
- endif()
- else()
- debug_message("ENV{PKG_CONFIG} found! Using: $ENV{PKG_CONFIG}")
- set(PKGCONFIG $ENV{PKG_CONFIG})
- endif()
+ vcpkg_find_acquire_program(PKGCONFIG)
if(VCPKG_LIBRARY_LINKAGE STREQUAL "static" AND NOT PKGCONFIG STREQUAL "--static")
set(PKGCONFIG "${PKGCONFIG} --static")
endif()
|