diff options
| author | LE GARREC Vincent <github@le-garrec.fr> | 2021-07-06 22:36:25 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-07-06 13:36:25 -0700 |
| commit | fc6d2ed5b92b5cbdc3fc17f538b6562811ac0bbc (patch) | |
| tree | 074b6c05225c7fbf4d1eafd762fd46053fe52d70 | |
| parent | 1d39c6f24680dc2f82de7c0b5f1923b19f25aa55 (diff) | |
| download | vcpkg-fc6d2ed5b92b5cbdc3fc17f538b6562811ac0bbc.tar.gz vcpkg-fc6d2ed5b92b5cbdc3fc17f538b6562811ac0bbc.zip | |
[catch2] Fix linux build in NTFS fs (#18814)
file(RENAME Camel lower) works fine when running vcpkg in
Windows Powershell with triplet x64-windows in NTFS fs.
file(RENAME Camel lower) does not work fine when running vcpkg in
WSL with triplet x64-linux in NTFS.
| -rw-r--r-- | ports/catch2/portfile.cmake | 6 | ||||
| -rw-r--r-- | ports/catch2/vcpkg.json | 1 | ||||
| -rw-r--r-- | versions/baseline.json | 2 | ||||
| -rw-r--r-- | versions/c-/catch2.json | 5 |
4 files changed, 11 insertions, 3 deletions
diff --git a/ports/catch2/portfile.cmake b/ports/catch2/portfile.cmake index 1d0291a57..0b2c4c0e7 100644 --- a/ports/catch2/portfile.cmake +++ b/ports/catch2/portfile.cmake @@ -16,8 +16,10 @@ 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") +file(RENAME "${CURRENT_PACKAGES_DIR}/share/Catch2" "${CURRENT_PACKAGES_DIR}/share/catch2_") +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_") +file(RENAME "${CURRENT_PACKAGES_DIR}/debug/share/catch2_" "${CURRENT_PACKAGES_DIR}/debug/share/catch2") vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/Catch2) diff --git a/ports/catch2/vcpkg.json b/ports/catch2/vcpkg.json index ddca8ee67..e0199bffa 100644 --- a/ports/catch2/vcpkg.json +++ b/ports/catch2/vcpkg.json @@ -1,6 +1,7 @@ { "name": "catch2", "version-semver": "2.13.6", + "port-version": 1, "description": "A modern, header-only test framework for unit testing.", "homepage": "https://github.com/catchorg/Catch2" } diff --git a/versions/baseline.json b/versions/baseline.json index 2736fa9db..ef3eaaabc 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1146,7 +1146,7 @@ }, "catch2": { "baseline": "2.13.6", - "port-version": 0 + "port-version": 1 }, "cccapstone": { "baseline": "9b4128ee1153e78288a1b5433e2c06a0d47a4c4e-1", diff --git a/versions/c-/catch2.json b/versions/c-/catch2.json index a9aa348e9..cca4c3a00 100644 --- a/versions/c-/catch2.json +++ b/versions/c-/catch2.json @@ -1,6 +1,11 @@ { "versions": [ { + "git-tree": "bd73b1d5e8994fb0327c333cd77400577f05e31c", + "version-semver": "2.13.6", + "port-version": 1 + }, + { "git-tree": "17d502dbaa50c2e6d255331addb14259372fb6c5", "version-semver": "2.13.6", "port-version": 0 |