mirror of https://github.com/microsoft/vcpkg.git
[catch2] no absolute paths (#27320)
This commit is contained in:
parent
fa7a620f9c
commit
7ad236f60f
|
|
@ -0,0 +1,13 @@
|
|||
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()
|
||||
|
|
@ -10,6 +10,7 @@ vcpkg_from_github(
|
|||
HEAD_REF devel
|
||||
PATCHES
|
||||
fix-install-path.patch
|
||||
no-absolute-paths.patch # from https://github.com/catchorg/Catch2/pull/2553
|
||||
)
|
||||
|
||||
vcpkg_cmake_configure(
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
{
|
||||
"name": "catch2",
|
||||
"version-semver": "3.1.1",
|
||||
"port-version": 1,
|
||||
"port-version": 2,
|
||||
"description": "A modern, header-only test framework for unit testing.",
|
||||
"homepage": "https://github.com/catchorg/Catch2",
|
||||
"license": "BSL-1.0",
|
||||
|
|
|
|||
|
|
@ -1314,7 +1314,7 @@
|
|||
},
|
||||
"catch2": {
|
||||
"baseline": "3.1.1",
|
||||
"port-version": 1
|
||||
"port-version": 2
|
||||
},
|
||||
"cccapstone": {
|
||||
"baseline": "9b4128ee1153e78288a1b5433e2c06a0d47a4c4e",
|
||||
|
|
|
|||
|
|
@ -1,5 +1,10 @@
|
|||
{
|
||||
"versions": [
|
||||
{
|
||||
"git-tree": "20c94cd5ff35ec979a2ad463322dc8a2a697acc7",
|
||||
"version-semver": "3.1.1",
|
||||
"port-version": 2
|
||||
},
|
||||
{
|
||||
"git-tree": "d83c493274ecc1798d1d4ac05bf83eedec161695",
|
||||
"version-semver": "3.1.1",
|
||||
|
|
|
|||
Loading…
Reference in New Issue