diff --git a/ports/bext-ut/avoid-cpm.patch b/ports/bext-ut/avoid-cpm.patch new file mode 100644 index 00000000000..c1022543a53 --- /dev/null +++ b/ports/bext-ut/avoid-cpm.patch @@ -0,0 +1,12 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -36,7 +36,7 @@ + # ---- Add dependencies via CPM ---- + # see https://github.com/cpm-cmake/CPM.cmake for more info + +-if(CMAKE_VERSION VERSION_LESS 3.20.0) ++if(1) + # see https://github.com/TheLartians/PackageProject.cmake/pull/19 + include(cmake/PackageProject.cmake) + else() diff --git a/ports/bext-ut/portfile.cmake b/ports/bext-ut/portfile.cmake index 14d456bc5b2..a76999db044 100644 --- a/ports/bext-ut/portfile.cmake +++ b/ports/bext-ut/portfile.cmake @@ -1,31 +1,26 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boost-ext/ut - REF v1.1.8 - SHA512 0df2f8ce784dc69c3cca5554a8b2be7c1664dd66bf52e83f305db5fae84d416a851e9282e9a8cfe50fbcada85b17da00fb25c1228d9cca32226a18bae18acb83 + REF v1.1.9 + SHA512 81a6b80948d3a203534244f62f5f3ac57593083cc0c32484498a7d01d29455f7dcb33e2ec0587609b8dff33a81a5551796d7681d48fd93e817d6d0c31697234e HEAD_REF master + PATCHES + avoid-cpm.patch ) -vcpkg_download_distfile(LICENSE_FILE - URLS https://www.boost.org/LICENSE_1_0.txt - FILENAME d6078467835dba893231.txt - SHA512 d6078467835dba8932314c1c1e945569a64b065474d7aced27c9a7acc391d52e9f234138ed9f1aa9cd576f25f12f557e0b733c14891d42c16ecdc4a7bd4d60b8 -) - -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" OPTIONS -DBOOST_UT_BUILD_BENCHMARKS=OFF -DBOOST_UT_BUILD_EXAMPLES=OFF -DBOOST_UT_BUILD_TESTS=OFF ) -vcpkg_install_cmake() +vcpkg_cmake_install() vcpkg_copy_pdbs() -vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/ut TARGET_PATH share/ut) +vcpkg_cmake_config_fixup(PACKAGE_NAME ut CONFIG_PATH lib/cmake/ut-1.1.8) -configure_file("${LICENSE_FILE}" "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright" COPYONLY) - -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug - ${CURRENT_PACKAGES_DIR}/lib +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug" + "${CURRENT_PACKAGES_DIR}/lib" ) + +file(INSTALL "${SOURCE_PATH}/LICENSE.md" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/bext-ut/vcpkg.json b/ports/bext-ut/vcpkg.json index 8a7c5d77f66..8ede04611e0 100644 --- a/ports/bext-ut/vcpkg.json +++ b/ports/bext-ut/vcpkg.json @@ -1,6 +1,17 @@ { "name": "bext-ut", - "version": "1.1.8", + "version": "1.1.9", "description": "UT: C++20 μ(micro)/Unit Testing Framework", - "homepage": "https://boost-ext.github.io/ut/" + "homepage": "https://boost-ext.github.io/ut/", + "license": "BSL-1.0", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] } diff --git a/versions/b-/bext-ut.json b/versions/b-/bext-ut.json index 6e6b6971f63..bd99a7fbc2d 100644 --- a/versions/b-/bext-ut.json +++ b/versions/b-/bext-ut.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "ea37a3905161a060e837b30d42868792d50029f8", + "version": "1.1.9", + "port-version": 0 + }, { "git-tree": "b08fed0b83c26aabfdda7db38d43a01b288f6a66", "version": "1.1.8", diff --git a/versions/baseline.json b/versions/baseline.json index 49677bca14b..cacf8a96f7e 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -441,7 +441,7 @@ "port-version": 0 }, "bext-ut": { - "baseline": "1.1.8", + "baseline": "1.1.9", "port-version": 0 }, "bext-wintls": {