diff --git a/ports/doctest/portfile.cmake b/ports/doctest/portfile.cmake index 2f78fb5b35e..d9510a0ffb8 100644 --- a/ports/doctest/portfile.cmake +++ b/ports/doctest/portfile.cmake @@ -1,21 +1,22 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH - REPO onqtam/doctest - REF v2.4.8 - SHA512 f9b40abfd756331f9b667f3c1e7dcf2652effacac70523834dd3946522f01459c095bdbad04651ad2ad155977e1395025f868ed4dcf5d5712aae9807afb5699c + REPO doctest/doctest + REF v2.4.9 + SHA512 c7337e2de371c18973a0f4cb76458d6ae387e78874c9bc8aa367ffd2d592514b774e7c5ebf44f83b7046f6b33c6905fd079c36f4c33eadf52b3d651d978182cb HEAD_REF master ) -vcpkg_configure_cmake( +vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" - PREFER_NINJA + DISABLE_PARALLEL_CONFIGURE OPTIONS -DDOCTEST_WITH_TESTS=OFF ) -vcpkg_install_cmake() -vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/doctest) +vcpkg_cmake_install() + +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/${PORT}) + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug" "${CURRENT_PACKAGES_DIR}/lib") -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 8b838d4503a..1983708f555 100644 --- a/ports/doctest/vcpkg.json +++ b/ports/doctest/vcpkg.json @@ -1,6 +1,17 @@ { "name": "doctest", - "version": "2.4.8", + "version": "2.4.9", "description": "The fastest feature-rich C++11/14/17/20 single-header testing framework", - "homepage": "https://github.com/onqtam/doctest" + "homepage": "https://github.com/doctest/doctest", + "license": "MIT", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] } diff --git a/versions/baseline.json b/versions/baseline.json index 97455e536cc..6793bb13467 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1949,7 +1949,7 @@ "port-version": 1 }, "doctest": { - "baseline": "2.4.8", + "baseline": "2.4.9", "port-version": 0 }, "double-conversion": { diff --git a/versions/d-/doctest.json b/versions/d-/doctest.json index f2afaf04b54..6049f6a60fe 100644 --- a/versions/d-/doctest.json +++ b/versions/d-/doctest.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "6f1ded501cbcf08445218ca0c5bee9df28188df9", + "version": "2.4.9", + "port-version": 0 + }, { "git-tree": "74d6364092a4086dd36a0d54a3d16e3cc24fe478", "version": "2.4.8",