mirror of
https://github.com/microsoft/vcpkg.git
synced 2025-01-19 04:43:02 +08:00
[catch2] Update to 3.2.0 (#28013)
* [catch2] Update to 3.2.0 * [catch2] Update version files
This commit is contained in:
parent
3f41432410
commit
d7bc6fd368
@ -13,14 +13,14 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
|
||||
--- a/src/CMakeLists.txt
|
||||
+++ b/src/CMakeLists.txt
|
||||
@@ -363,16 +363,28 @@
|
||||
@@ -401,16 +401,28 @@
|
||||
install(
|
||||
TARGETS
|
||||
Catch2
|
||||
- Catch2WithMain
|
||||
EXPORT
|
||||
Catch2Targets
|
||||
LIBRARY DESTINATION
|
||||
LIBRARY DESTINATION
|
||||
${CMAKE_INSTALL_LIBDIR}
|
||||
ARCHIVE DESTINATION
|
||||
${CMAKE_INSTALL_LIBDIR}
|
||||
|
@ -1,13 +0,0 @@
|
||||
diff --git a/CMake/CatchMiscFunctions.cmake b/CMake/CatchMiscFunctions.cmake
|
||||
index be76d8380..5a068d088 100644
|
||||
--- a/CMake/CatchMiscFunctions.cmake
|
||||
+++ b/CMake/CatchMiscFunctions.cmake
|
||||
@@ -13,7 +13,7 @@ function(add_cxx_flag_if_supported_to_targets flagname targets)
|
||||
|
||||
if (HAVE_FLAG_${flag_identifier})
|
||||
foreach(target ${targets})
|
||||
- target_compile_options(${target} PUBLIC ${flagname})
|
||||
+ target_compile_options(${target} PRIVATE ${flagname})
|
||||
endforeach()
|
||||
endif()
|
||||
endfunction()
|
@ -1,16 +1,16 @@
|
||||
if(VCPKG_TARGET_IS_WINDOWS)
|
||||
vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
|
||||
endif()
|
||||
vcpkg_minimum_required(VERSION 2022-11-10)
|
||||
|
||||
vcpkg_from_github(
|
||||
OUT_SOURCE_PATH SOURCE_PATH
|
||||
REPO catchorg/Catch2
|
||||
REF v3.1.1
|
||||
SHA512 b6deae2e87ae301bb3de9e378297a3f20333bb5f233fd9ef81f8c4f10fe0c4ad5de9174b850da8064607b9c56c68c7a0815e2bac80108e6db905bc660def7d57
|
||||
REF v${VERSION}
|
||||
SHA512 983d37824a8d9e24ff107d27f11cb4f8ea53516dc2c5c9b32d4758c718f29041eecdb023d81a2776c87d283e3671722352c9f0eea02393b5bb191fa26bb12c82
|
||||
HEAD_REF devel
|
||||
PATCHES
|
||||
fix-install-path.patch
|
||||
no-absolute-paths.patch # from https://github.com/catchorg/Catch2/pull/2553
|
||||
)
|
||||
|
||||
vcpkg_cmake_configure(
|
||||
@ -33,4 +33,4 @@ file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/include/catch2/benchmark/internal")
|
||||
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/include/catch2/generators/internal")
|
||||
|
||||
file(WRITE "${CURRENT_PACKAGES_DIR}/include/catch.hpp" "#include <catch2/catch_all.hpp>")
|
||||
file(INSTALL "${SOURCE_PATH}/LICENSE.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
|
||||
vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE.txt")
|
||||
|
@ -1,7 +1,6 @@
|
||||
{
|
||||
"name": "catch2",
|
||||
"version-semver": "3.1.1",
|
||||
"port-version": 2,
|
||||
"version-semver": "3.2.0",
|
||||
"description": "A modern, header-only test framework for unit testing.",
|
||||
"homepage": "https://github.com/catchorg/Catch2",
|
||||
"license": "BSL-1.0",
|
||||
|
@ -1313,8 +1313,8 @@
|
||||
"port-version": 1
|
||||
},
|
||||
"catch2": {
|
||||
"baseline": "3.1.1",
|
||||
"port-version": 2
|
||||
"baseline": "3.2.0",
|
||||
"port-version": 0
|
||||
},
|
||||
"cccapstone": {
|
||||
"baseline": "9b4128ee1153e78288a1b5433e2c06a0d47a4c4e",
|
||||
|
@ -1,5 +1,10 @@
|
||||
{
|
||||
"versions": [
|
||||
{
|
||||
"git-tree": "9dd2bc1c39e6f6262dc7741b24514e76d6f1d8da",
|
||||
"version-semver": "3.2.0",
|
||||
"port-version": 0
|
||||
},
|
||||
{
|
||||
"git-tree": "20c94cd5ff35ec979a2ad463322dc8a2a697acc7",
|
||||
"version-semver": "3.1.1",
|
||||
|
Loading…
Reference in New Issue
Block a user