aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTom Tan <lilotom@gmail.com>2020-09-05 07:22:07 -0700
committerGitHub <noreply@github.com>2020-09-05 07:22:07 -0700
commit95f6e7d0c75b4d7f4bf529362a6f44d023b79fd0 (patch)
treec72920ccbd60723daca09c38006665604ecc9897
parentabda2ddcb4e5f0d074fe8c8d83c2e5cd525ec370 (diff)
downloadvcpkg-95f6e7d0c75b4d7f4bf529362a6f44d023b79fd0.tar.gz
vcpkg-95f6e7d0c75b4d7f4bf529362a6f44d023b79fd0.zip
Download pkgconfig for protobuf in download mode (#13263)
* Download pkgconfig for protobuf in download mode * Bump version of protobuf * Update ports/protobuf/CONTROL Co-authored-by: Jack·Boos·Yu <47264268+JackBoosY@users.noreply.github.com>
-rw-r--r--ports/protobuf/CONTROL1
-rw-r--r--ports/protobuf/portfile.cmake5
2 files changed, 6 insertions, 0 deletions
diff --git a/ports/protobuf/CONTROL b/ports/protobuf/CONTROL
index a79f2aaf2..ecacb7c28 100644
--- a/ports/protobuf/CONTROL
+++ b/ports/protobuf/CONTROL
@@ -1,5 +1,6 @@
Source: protobuf
Version: 3.13.0
+Port-Version: 1
Homepage: https://github.com/protocolbuffers/protobuf
Description: Protocol Buffers - Google's data interchange format
diff --git a/ports/protobuf/portfile.cmake b/ports/protobuf/portfile.cmake
index 389674afb..ab2578f74 100644
--- a/ports/protobuf/portfile.cmake
+++ b/ports/protobuf/portfile.cmake
@@ -38,6 +38,11 @@ vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
zlib protobuf_WITH_ZLIB
)
+if (VCPKG_DOWNLOAD_MODE)
+ # download PKGCONFIG in download mode which is used in `vcpkg_fixup_pkgconfig()` at the end of this script.
+ # download it here because `vcpkg_configure_cmake()` halts execution in download mode when running configure process.
+ vcpkg_find_acquire_program(PKGCONFIG)
+endif()
vcpkg_configure_cmake(
SOURCE_PATH ${SOURCE_PATH}/cmake