diff options
| author | Billy Robert O'Neal III <bion@microsoft.com> | 2020-03-12 14:40:01 -0700 |
|---|---|---|
| committer | Billy Robert O'Neal III <bion@microsoft.com> | 2020-03-12 14:40:01 -0700 |
| commit | 5c36b48154e31f935cfbe856ad6c52ba892cdcb5 (patch) | |
| tree | 05aad169f895f10b8c8780722dd02007ed616a74 /ports/libgit2 | |
| parent | 52214665b200f6ff66a77d0454708438fb60317e (diff) | |
| parent | c2795f1662b0cd3c801a7788cda042b4f3fdc1fe (diff) | |
| download | vcpkg-5c36b48154e31f935cfbe856ad6c52ba892cdcb5.tar.gz vcpkg-5c36b48154e31f935cfbe856ad6c52ba892cdcb5.zip | |
Merge remote-tracking branch 'origin/master' into warning
Diffstat (limited to 'ports/libgit2')
| -rw-r--r-- | ports/libgit2/CONTROL | 12 | ||||
| -rw-r--r-- | ports/libgit2/portfile.cmake | 9 |
2 files changed, 19 insertions, 2 deletions
diff --git a/ports/libgit2/CONTROL b/ports/libgit2/CONTROL index fbf739e77..bbfedcd33 100644 --- a/ports/libgit2/CONTROL +++ b/ports/libgit2/CONTROL @@ -1,6 +1,14 @@ Source: libgit2
-Version: 0.99.0
+Version: 0.99.0-1
Homepage: https://github.com/libgit2/libgit2
-Build-Depends: openssl (!windows&&!uwp)
+Build-Depends: zlib, openssl (!windows&&!uwp)
Description: Git linkable library
Supports: !uwp
+
+Feature: pcre
+Description: Build against external libpcre
+Build-Depends: pcre
+
+Feature: pcre2
+Description: Build against external libpcre2
+Build-Depends: pcre2
diff --git a/ports/libgit2/portfile.cmake b/ports/libgit2/portfile.cmake index 12566af64..fe5ef45ce 100644 --- a/ports/libgit2/portfile.cmake +++ b/ports/libgit2/portfile.cmake @@ -11,11 +11,20 @@ vcpkg_from_github( string(COMPARE EQUAL "${VCPKG_CRT_LINKAGE}" "static" STATIC_CRT)
+if ("pcre" IN_LIST FEATURES)
+ set(REGEX_BACKEND pcre)
+elseif ("pcre2" IN_LIST FEATURES)
+ set(REGEX_BACKEND pcre2)
+else()
+ set(REGEX_BACKEND builtin)
+endif()
+
vcpkg_configure_cmake(
SOURCE_PATH ${SOURCE_PATH}
PREFER_NINJA
OPTIONS
-DBUILD_CLAR=OFF
+ -DREGEX_BACKEND=${REGEX_BACKEND}
-DSTATIC_CRT=${STATIC_CRT}
)
|