[catch2] update to 3.9.0 (#46611)

This commit is contained in:
toge
2025-07-29 11:22:18 +09:00
committed by GitHub
parent 3bdaa9b420
commit a5898e78ce
5 changed files with 64 additions and 41 deletions

View File

@@ -1,45 +1,52 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 1676ee7..5231934 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -164,7 +164,7 @@
## Provide some pkg-config integration
set(PKGCONFIG_INSTALL_DIR
- "${CMAKE_INSTALL_DATAROOTDIR}/pkgconfig"
+ "${CMAKE_INSTALL_LIBDIR}/pkgconfig"
CACHE PATH "Path where catch2.pc is installed"
@@ -167,13 +167,13 @@ if(NOT_SUBPROJECT)
"extras/gdbinit"
"extras/lldbinit"
DESTINATION
- ${CMAKE_INSTALL_DATAROOTDIR}/Catch2
+ ${CMAKE_INSTALL_DATAROOTDIR}/catch2
)
configure_file(
endif()
## Provide some pkg-config integration
set(PKGCONFIG_INSTALL_DIR
- "${CMAKE_INSTALL_DATAROOTDIR}/pkgconfig"
+ "${CMAKE_INSTALL_LIBDIR}/pkgconfig"
CACHE PATH "Path where catch2.pc is installed"
)
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 1e3af14..265626c 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -401,16 +401,28 @@
install(
TARGETS
Catch2
- Catch2WithMain
EXPORT
Catch2Targets
LIBRARY DESTINATION
${CMAKE_INSTALL_LIBDIR}
ARCHIVE DESTINATION
${CMAKE_INSTALL_LIBDIR}
RUNTIME DESTINATION
${CMAKE_INSTALL_BINDIR}
)
@@ -402,7 +402,6 @@ if(NOT_SUBPROJECT)
install(
TARGETS
Catch2
- Catch2WithMain
EXPORT
Catch2Targets
LIBRARY DESTINATION
@@ -413,6 +412,19 @@ if(NOT_SUBPROJECT)
${CMAKE_INSTALL_BINDIR}
)
+ install(
+ TARGETS
+ Catch2WithMain
+ EXPORT
+ Catch2Targets
+ LIBRARY DESTINATION
+ ${CMAKE_INSTALL_LIBDIR}/manual-link
+ ARCHIVE DESTINATION
+ ${CMAKE_INSTALL_LIBDIR}/manual-link
+ RUNTIME DESTINATION
+ ${CMAKE_INSTALL_BINDIR}
+ )
+
+ install(
+ TARGETS
+ Catch2WithMain
+ EXPORT
+ Catch2Targets
+ LIBRARY DESTINATION
+ ${CMAKE_INSTALL_LIBDIR}/manual-link
+ ARCHIVE DESTINATION
+ ${CMAKE_INSTALL_LIBDIR}/manual-link
+ RUNTIME DESTINATION
+ ${CMAKE_INSTALL_BINDIR}
+ )
install(
install(
EXPORT
Catch2Targets

View File

@@ -6,15 +6,21 @@ vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO catchorg/Catch2
REF v${VERSION}
SHA512 071f407dfefa84c3f766e32de48525dcaa50f5c5b0a2e2e9e615fdfff8d36476c7a28c9c27f4030fcf2f5f612043124efe61582bc2c174ddb62b4f307f74ffc5
SHA512 b215216088dbebf0d590351767e71e7643158b26835e3d6dab8c826d8252c4ab09697dd9eaf37d34ad7fc7cc367846bf501ee9489ba3a407ace00ae5d18268ed
HEAD_REF devel
PATCHES
fix-install-path.patch
)
vcpkg_check_features(OUT_FEATURE_OPTIONS OPTIONS
FEATURES
thread-safe-assertions CATCH_CONFIG_EXPERIMENTAL_THREAD_SAFE_ASSERTIONS
)
vcpkg_cmake_configure(
SOURCE_PATH "${SOURCE_PATH}"
OPTIONS
${OPTIONS}
-DCATCH_INSTALL_DOCS=OFF
-DCMAKE_CXX_STANDARD=17
)

View File

@@ -1,6 +1,6 @@
{
"name": "catch2",
"version-semver": "3.8.1",
"version-semver": "3.9.0",
"description": "A modern, C++-native, test framework for unit-tests, TDD and BDD.",
"homepage": "https://github.com/catchorg/Catch2",
"license": "BSL-1.0",
@@ -13,5 +13,10 @@
"name": "vcpkg-cmake-config",
"host": true
}
]
],
"features": {
"thread-safe-assertions": {
"description": "Enables thread safe assertions"
}
}
}

View File

@@ -1589,7 +1589,7 @@
"port-version": 2
},
"catch2": {
"baseline": "3.8.1",
"baseline": "3.9.0",
"port-version": 0
},
"cblas": {

View File

@@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "590677ebecf3adb5538800ecf058a35390896fe0",
"version-semver": "3.9.0",
"port-version": 0
},
{
"git-tree": "663b04662ae30cc321b1b1a0c781c9f4a3d29b93",
"version-semver": "3.8.1",