From f9bd4c8740f3f4e5261eb5df2aeefaff1f1571d0 Mon Sep 17 00:00:00 2001 From: Michael Wild Date: Tue, 20 Apr 2021 01:48:12 +0200 Subject: [catch2] Fix share/catch2 directory name conflict (#17271) Catch2 installs into share/Catch2/ and lib/cmake/Catch2. The vcpkg_fixup_cmake_targets() function tries to move the contents from the latter directory to share/catch2, i.e. differing in case w.r.t. the former. On Linux this results in both names being present. On pure Windows the first name "wins". It breaks in a Linux Docker container where the installation root is located on a bound directory that is on a case-insensitive file system, such as from a host running Windows. Fixes: #17228. --- versions/baseline.json | 2 +- versions/c-/catch2.json | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) (limited to 'versions') 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,5 +1,10 @@ { "versions": [ + { + "git-tree": "47ba2c2a9ed12b317550ed102374cd13554fe9ac", + "version-string": "2.13.1", + "port-version": 1 + }, { "git-tree": "519a6fcb84ac66fdffb75f3d5555496228e43e5f", "version-string": "2.13.1", -- cgit v1.2.3