diff options
| author | Kevin Lu <6320810+kevinlul@users.noreply.github.com> | 2020-03-11 12:16:42 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-03-11 09:16:42 -0700 |
| commit | fd12965463aae42eca6d2c0da473e0f0ecff5615 (patch) | |
| tree | 601daa9c021d4e4f2a05e787b067855beb28c61d | |
| parent | 2c68b1229b7b8ebba5f53d78441917e72385e16e (diff) | |
| download | vcpkg-fd12965463aae42eca6d2c0da473e0f0ecff5615.tar.gz vcpkg-fd12965463aae42eca6d2c0da473e0f0ecff5615.zip | |
[libgit2] Add features pcre,pcre2 to choose regex backend (#10333)
* [libgit2] Add features to build against vcpkg pcre,pcre2
* version
* libgit2 will automatically link to 'system' zlib, which is inconsistent depending on if vcpkg zlib was installed or not. This rectifies this by always targeting vcpkg zlib
| -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}
)
|