aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMikeGitb <MikeGitb@users.noreply.github.com>2018-07-30 20:28:12 +0200
committerRobert Schumacher <roschuma@microsoft.com>2018-07-30 11:28:12 -0700
commit3a94c1cb643e67d6f8aeea398e5f96d1387396d1 (patch)
treef4b656bebce3ecbd282c31b863c65c6c2c5b333f
parent2035d0124dd01ea3ebabfdcc99c7275f723cab13 (diff)
downloadvcpkg-3a94c1cb643e67d6f8aeea398e5f96d1387396d1.tar.gz
vcpkg-3a94c1cb643e67d6f8aeea398e5f96d1387396d1.zip
[Catch2] Update to 2.3.0 (#3959)
* [Catch2] Update to 2.3.0 * [Catch2] Fix version in CONTROL file to 2.3
-rw-r--r--ports/catch2/CONTROL2
-rw-r--r--ports/catch2/portfile.cmake8
2 files changed, 5 insertions, 5 deletions
diff --git a/ports/catch2/CONTROL b/ports/catch2/CONTROL
index 6cefca9db..41b534b59 100644
--- a/ports/catch2/CONTROL
+++ b/ports/catch2/CONTROL
@@ -1,4 +1,4 @@
Source: catch2
-Version: 2.2.3
+Version: 2.3.0
Description: A modern, header-only test framework for unit testing.
Issues, PRs and changelogs can be found at https://github.com/catchorg/Catch2
diff --git a/ports/catch2/portfile.cmake b/ports/catch2/portfile.cmake
index d3c4cee03..763ee1987 100644
--- a/ports/catch2/portfile.cmake
+++ b/ports/catch2/portfile.cmake
@@ -3,8 +3,8 @@ include(vcpkg_common_functions)
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO catchorg/Catch2
- REF v2.2.3
- SHA512 d065d5797045ce85f576977f78cbdc77a1e8ab820e164aafd91d305aa10a29f7f306734d484714ec05078858457d0a17a57a6246166da3c8f3c708a23a2adc46
+ REF v2.3.0
+ SHA512 e9a089b504c339e87bda0fb1a4040d9d19c932a4bc7dca41bdad6edfcf8c428f4152ff1e0c898dfdf6b20bd5d901c343bed00ad89351fa5182f3c106e0fb4b03
HEAD_REF master
)
@@ -22,9 +22,9 @@ vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/Catch2 TARGET_PATH share/catch2)
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug ${CURRENT_PACKAGES_DIR}/lib)
-if(NOT EXISTS ${CURRENT_PACKAGES_DIR}/include/catch/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 <catch/catch.hpp>")
+file(WRITE ${CURRENT_PACKAGES_DIR}/include/catch.hpp "#include <catch2/catch.hpp>")
file(INSTALL ${SOURCE_PATH}/LICENSE.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/catch2 RENAME copyright)