diff options
| -rw-r--r-- | ports/catch2/CONTROL | 1 | ||||
| -rw-r--r-- | ports/catch2/portfile.cmake | 11 | ||||
| -rw-r--r-- | versions/baseline.json | 2 | ||||
| -rw-r--r-- | versions/c-/catch2.json | 5 |
4 files changed, 14 insertions, 5 deletions
diff --git a/ports/catch2/CONTROL b/ports/catch2/CONTROL index add0f035e..3d56f8060 100644 --- a/ports/catch2/CONTROL +++ b/ports/catch2/CONTROL @@ -1,4 +1,5 @@ Source: catch2 Version: 2.13.1 +Port-Version: 1 Description: A modern, header-only test framework for unit testing. Homepage: https://github.com/catchorg/Catch2 diff --git a/ports/catch2/portfile.cmake b/ports/catch2/portfile.cmake index 72365eb46..f767f9eec 100644 --- a/ports/catch2/portfile.cmake +++ b/ports/catch2/portfile.cmake @@ -16,13 +16,16 @@ vcpkg_configure_cmake( vcpkg_install_cmake() +file(RENAME "${CURRENT_PACKAGES_DIR}/share/Catch2" "${CURRENT_PACKAGES_DIR}/share/catch2") +file(RENAME "${CURRENT_PACKAGES_DIR}/debug/share/Catch2" "${CURRENT_PACKAGES_DIR}/debug/share/catch2") + vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/Catch2) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug ${CURRENT_PACKAGES_DIR}/lib) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug" "${CURRENT_PACKAGES_DIR}/lib") -if(NOT EXISTS ${CURRENT_PACKAGES_DIR}/include/catch2/catch.hpp) +if(NOT EXISTS "${CURRENT_PACKAGES_DIR}/include/catch2/catch.hpp") message(FATAL_ERROR "Main includes have moved. Please update the forwarder.") endif() -file(WRITE ${CURRENT_PACKAGES_DIR}/include/catch.hpp "#include <catch2/catch.hpp>") -file(INSTALL ${SOURCE_PATH}/LICENSE.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +file(WRITE "${CURRENT_PACKAGES_DIR}/include/catch.hpp" "#include <catch2/catch.hpp>") +file(INSTALL "${SOURCE_PATH}/LICENSE.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/versions/baseline.json b/versions/baseline.json index 1dc640b01..c2aed73cd 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1118,7 +1118,7 @@ }, "catch2": { "baseline": "2.13.1", - "port-version": 0 + "port-version": 1 }, "cccapstone": { "baseline": "9b4128ee1153e78288a1b5433e2c06a0d47a4c4e-1", diff --git a/versions/c-/catch2.json b/versions/c-/catch2.json index fde3f3074..0edb437e7 100644 --- a/versions/c-/catch2.json +++ b/versions/c-/catch2.json @@ -1,6 +1,11 @@ { "versions": [ { + "git-tree": "47ba2c2a9ed12b317550ed102374cd13554fe9ac", + "version-string": "2.13.1", + "port-version": 1 + }, + { "git-tree": "519a6fcb84ac66fdffb75f3d5555496228e43e5f", "version-string": "2.13.1", "port-version": 0 |