aboutsummaryrefslogtreecommitdiff
path: root/ports/pcre2
diff options
context:
space:
mode:
authorLarryIII <33021067+LarryIII@users.noreply.github.com>2019-03-27 22:02:31 -0700
committerPhil Christensen <philc@microsoft.com>2019-03-27 22:02:31 -0700
commit78a8de6cf468dc3d3301b26fedae7969bb366a75 (patch)
tree07e482b1da0c6bdc1d2ee6d215155802094408a7 /ports/pcre2
parent493b76284dd0b075ac9486be6c9bd60af105bd3b (diff)
downloadvcpkg-78a8de6cf468dc3d3301b26fedae7969bb366a75.tar.gz
vcpkg-78a8de6cf468dc3d3301b26fedae7969bb366a75.zip
[pcre2/caffe2] Fix space issue (#5827)
* [pcre2/caffe2] Fix space issue
Diffstat (limited to 'ports/pcre2')
-rw-r--r--ports/pcre2/CONTROL2
-rw-r--r--ports/pcre2/portfile.cmake11
2 files changed, 7 insertions, 6 deletions
diff --git a/ports/pcre2/CONTROL b/ports/pcre2/CONTROL
index 79982525a..37f3a6da3 100644
--- a/ports/pcre2/CONTROL
+++ b/ports/pcre2/CONTROL
@@ -1,3 +1,3 @@
Source: pcre2
-Version: 10.30-2
+Version: 10.30-3
Description: PCRE2 is a re-working of the original Perl Compatible Regular Expressions library
diff --git a/ports/pcre2/portfile.cmake b/ports/pcre2/portfile.cmake
index 34e4cf726..e2f5a702a 100644
--- a/ports/pcre2/portfile.cmake
+++ b/ports/pcre2/portfile.cmake
@@ -1,12 +1,16 @@
set(PCRE2_VERSION 10.30)
include(vcpkg_common_functions)
-set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/pcre2-${PCRE2_VERSION})
+
vcpkg_download_distfile(ARCHIVE
URLS "https://ftp.pcre.org/pub/pcre/pcre2-${PCRE2_VERSION}.zip" "https://sourceforge.net/projects/pcre/files/pcre2/${PCRE2_VERSION}/pcre2-${PCRE2_VERSION}.zip/download"
FILENAME "pcre2-${PCRE2_VERSION}.zip"
SHA512 03e570b946ac29498a114b27e715a0fcf25702bfc9623f9fc085ee8a3214ab3c303baccb9c0af55da6916e8ce40d931d97f1ee9628690563041a943f0aa2bc54)
-vcpkg_extract_source_archive(${ARCHIVE})
+vcpkg_extract_source_archive_ex(
+ OUT_SOURCE_PATH SOURCE_PATH
+ ARCHIVE ${ARCHIVE}
+ PATCHES fix-space.patch
+)
vcpkg_configure_cmake(
SOURCE_PATH ${SOURCE_PATH}
@@ -20,9 +24,6 @@ vcpkg_configure_cmake(
-DPCRE2_BUILD_TESTS=OFF
-DPCRE2_BUILD_PCRE2GREP=OFF)
-vcpkg_apply_patches(SOURCE_PATH ${SOURCE_PATH}
- PATCHES ${CMAKE_CURRENT_LIST_DIR}/fix-space.patch)
-
vcpkg_install_cmake()
file(READ ${CURRENT_PACKAGES_DIR}/include/pcre2.h PCRE2_H)