mirror/vcpkg
1
0
Fork 0
mirror of https://github.com/microsoft/vcpkg.git synced 2024-11-24 12:41:38 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

[catch2] Fix share/catch2 directory name conflict (#17271)

Browse Source 
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.
This commit is contained in:
Michael Wild 2021-04-20 01:48:12 +02:00 committed by GitHub
parent 4c830b1516
commit f9bd4c8740
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ports/catch2/CONTROL
View File

@ -1,4 +1,5 @@
Source: catch2
Version: 2.13.1
Port-Version: 1
Description: A modern, header-only test framework for unit testing.
Homepage: https://github.com/catchorg/Catch2

11
ports/catch2/portfile.cmake
View File

@ -16,13 +16,16 @@ vcpkg_configure_cmake(
vcpkg_install_cmake()
file(RENAME "${CURRENT_PACKAGES_DIR}/share/Catch2" "${CURRENT_PACKAGES_DIR}/share/catch2")
file(RENAME "${CURRENT_PACKAGES_DIR}/debug/share/Catch2" "${CURRENT_PACKAGES_DIR}/debug/share/catch2")
vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/Catch2)
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug ${CURRENT_PACKAGES_DIR}/lib)
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug" "${CURRENT_PACKAGES_DIR}/lib")
if(NOT EXISTS ${CURRENT_PACKAGES_DIR}/include/catch2/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 <catch2/catch.hpp>")
file(INSTALL ${SOURCE_PATH}/LICENSE.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
file(WRITE "${CURRENT_PACKAGES_DIR}/include/catch.hpp" "#include <catch2/catch.hpp>")
file(INSTALL "${SOURCE_PATH}/LICENSE.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)

2
versions/baseline.json
View File

@ -1118,7 +1118,7 @@
},
"catch2": {
"baseline": "2.13.1",
"port-version": 0
"port-version": 1
},
"cccapstone": {
"baseline": "9b4128ee1153e78288a1b5433e2c06a0d47a4c4e-1",

5
versions/c-/catch2.json
View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "47ba2c2a9ed12b317550ed102374cd13554fe9ac",
"version-string": "2.13.1",
"port-version": 1
},
{
"git-tree": "519a6fcb84ac66fdffb75f3d5555496228e43e5f",
"version-string": "2.13.1",