aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorchausner <15180557+chausner@users.noreply.github.com>2021-10-06 01:12:22 +0200
committerGitHub <noreply@github.com>2021-10-05 16:12:22 -0700
commit97d384b1175b295df2aa69df145fa850656d5af3 (patch)
tree6e98307bcb7d22796f0f7f4c222a5e704af4cc9f
parente3a6b17c06514bd821dc8e3e0abadb9f2c6fab69 (diff)
downloadvcpkg-97d384b1175b295df2aa69df145fa850656d5af3.tar.gz
vcpkg-97d384b1175b295df2aa69df145fa850656d5af3.zip
[doctest] Update to 2.4.6 (#20493)
* Update doctest to 2.4.6 * Update CI baseline Co-authored-by: chausner <chausner@users.noreply.github.com> Co-authored-by: Billy Robert O'Neal III <bion@microsoft.com>
-rw-r--r--ports/doctest/portfile.cmake12
-rw-r--r--ports/doctest/vcpkg.json3
-rw-r--r--versions/baseline.json4
-rw-r--r--versions/d-/doctest.json5
4 files changed, 14 insertions, 10 deletions
diff --git a/ports/doctest/portfile.cmake b/ports/doctest/portfile.cmake
index 356b63909..170c48578 100644
--- a/ports/doctest/portfile.cmake
+++ b/ports/doctest/portfile.cmake
@@ -1,13 +1,13 @@
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO onqtam/doctest
- REF f0ab4e793fa863d4a5929ff263ddd3bebec8767e #version 2.4.5
- SHA512 7107787bc10e842b796b0d4dbe6d364ec6ca84813f00f48a07c4c91eb2fc71bd01779715296955dac2219b681f33721f3be46cb884997b4d84bf366122a620d6
+ REF 2.4.6
+ SHA512 A5CCCF085AF946003140AF688F071A6407D42FC685324A537E3B704EF9DE0F2228BD06EABFD1DF8DA70DEC001420DD0B2813E5E4320B5C1DA450CB0AADD63788
HEAD_REF master
)
vcpkg_configure_cmake(
- SOURCE_PATH ${SOURCE_PATH}
+ SOURCE_PATH "${SOURCE_PATH}"
PREFER_NINJA
OPTIONS
-DDOCTEST_WITH_TESTS=OFF
@@ -16,6 +16,6 @@ vcpkg_configure_cmake(
vcpkg_install_cmake()
vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/doctest)
-file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/lib)
-file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug)
-configure_file(${SOURCE_PATH}/LICENSE.txt ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright COPYONLY) \ No newline at end of file
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/lib")
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug")
+file(INSTALL "${SOURCE_PATH}/LICENSE.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) \ No newline at end of file
diff --git a/ports/doctest/vcpkg.json b/ports/doctest/vcpkg.json
index 4a4cdaad2..060fecff6 100644
--- a/ports/doctest/vcpkg.json
+++ b/ports/doctest/vcpkg.json
@@ -1,7 +1,6 @@
{
"name": "doctest",
- "version-string": "2.4.5",
- "port-version": 1,
+ "version": "2.4.6",
"description": "The fastest feature-rich C++ single-header testing framework for unit tests and TDD",
"homepage": "https://github.com/onqtam/doctest"
}
diff --git a/versions/baseline.json b/versions/baseline.json
index f93c9c3e9..a4ad0f361 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -1849,8 +1849,8 @@
"port-version": 1
},
"doctest": {
- "baseline": "2.4.5",
- "port-version": 1
+ "baseline": "2.4.6",
+ "port-version": 0
},
"double-conversion": {
"baseline": "3.1.5",
diff --git a/versions/d-/doctest.json b/versions/d-/doctest.json
index 30a591ff0..d413559fa 100644
--- a/versions/d-/doctest.json
+++ b/versions/d-/doctest.json
@@ -1,6 +1,11 @@
{
"versions": [
{
+ "git-tree": "15aee759d06d6b4a61bc3fec3ecd1fbfac7c1d05",
+ "version": "2.4.6",
+ "port-version": 0
+ },
+ {
"git-tree": "7e39ece916763931668299b3856bbbb8e41308cf",
"version-string": "2.4.5",
"port-version": 1