diff options
| author | chausner <15180557+chausner@users.noreply.github.com> | 2021-09-29 17:39:07 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-09-29 08:39:07 -0700 |
| commit | ac10ff41f8d3ec385891837a824a4abfac329aa3 (patch) | |
| tree | f836df4bccb4807b996854bd13552f77db22e47a | |
| parent | 7c318c408f3acf2fcb13c9882f453891eb6a95f4 (diff) | |
| download | vcpkg-ac10ff41f8d3ec385891837a824a4abfac329aa3.tar.gz vcpkg-ac10ff41f8d3ec385891837a824a4abfac329aa3.zip | |
[pegtl] Update to 3.2.1 (#20400)
* Update pegtl to 3.2.1
* Update CI baseline
* Update ports/pegtl/portfile.cmake
* Update versions/p-/pegtl.json
Co-authored-by: chausner <chausner@users.noreply.github.com>
Co-authored-by: Billy Robert O'Neal III <bion@microsoft.com>
Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com>
| -rw-r--r-- | ports/pegtl/portfile.cmake | 17 | ||||
| -rw-r--r-- | ports/pegtl/vcpkg.json | 15 | ||||
| -rw-r--r-- | versions/baseline.json | 4 | ||||
| -rw-r--r-- | versions/p-/pegtl.json | 5 |
4 files changed, 27 insertions, 14 deletions
diff --git a/ports/pegtl/portfile.cmake b/ports/pegtl/portfile.cmake index 265f596c4..f54e1d239 100644 --- a/ports/pegtl/portfile.cmake +++ b/ports/pegtl/portfile.cmake @@ -1,14 +1,13 @@ vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO taocpp/pegtl
- REF 3.2.0
- SHA512 3ec457e37d87d95f3a89c550abbf611a1ce094c2f05f6d23086e70079a9cabddb4c75e9121e764ad1768845a39e62ab49ca658ffed0f09d0e9a0e36501a162ae
+ REF 3.2.1
+ SHA512 6297ADEA085BB3043A60C28EB3A868A7C2D203B351F907EA3FDC4EF34C63F87A5786AC7D297531F8B8C8C3414F5DDEF658A025A7BAE2515BDC750E974975F6FF
HEAD_REF master
)
-vcpkg_configure_cmake(
- SOURCE_PATH ${SOURCE_PATH}
- PREFER_NINJA
+vcpkg_cmake_configure(
+ SOURCE_PATH "${SOURCE_PATH}"
OPTIONS
-DPEGTL_BUILD_TESTS=OFF
-DPEGTL_BUILD_EXAMPLES=OFF
@@ -16,11 +15,11 @@ vcpkg_configure_cmake( -DPEGTL_INSTALL_CMAKE_DIR=share/pegtl/cmake
)
-vcpkg_install_cmake()
+vcpkg_cmake_install()
-vcpkg_fixup_cmake_targets(CONFIG_PATH share/pegtl/cmake)
+vcpkg_cmake_config_fixup(CONFIG_PATH share/pegtl/cmake)
-file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug)
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug")
# Handle copyright
-file(RENAME ${CURRENT_PACKAGES_DIR}/share/pegtl/LICENSE ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright)
+file(RENAME "${CURRENT_PACKAGES_DIR}/share/pegtl/LICENSE" "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright")
diff --git a/ports/pegtl/vcpkg.json b/ports/pegtl/vcpkg.json index 0a56f3f72..9db2de5a3 100644 --- a/ports/pegtl/vcpkg.json +++ b/ports/pegtl/vcpkg.json @@ -1,7 +1,16 @@ { "name": "pegtl", - "version-string": "3.2.0", - "port-version": 1, + "version-semver": "3.2.1", "description": "The Parsing Expression Grammar Template Library (PEGTL) is a zero-dependency C++ header-only parser combinator library for creating parsers according to a Parsing Expression Grammar (PEG).", - "homepage": "https://github.com/taocpp/PEGTL" + "homepage": "https://github.com/taocpp/PEGTL", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] } diff --git a/versions/baseline.json b/versions/baseline.json index ff9231e1f..a499edc0c 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5073,8 +5073,8 @@ "port-version": 1 }, "pegtl": { - "baseline": "3.2.0", - "port-version": 1 + "baseline": "3.2.1", + "port-version": 0 }, "pegtl-2": { "baseline": "2.8.3", diff --git a/versions/p-/pegtl.json b/versions/p-/pegtl.json index 94ef7afee..abc03684d 100644 --- a/versions/p-/pegtl.json +++ b/versions/p-/pegtl.json @@ -1,6 +1,11 @@ { "versions": [ { + "git-tree": "4a95202decfce79a39190525dea1c3a135bf393f", + "version-semver": "3.2.1", + "port-version": 0 + }, + { "git-tree": "2e4a20284dace72d0591ae48e03087333c857991", "version-string": "3.2.0", "port-version": 1 |