Skip to content

Commit

Permalink
[catch2] Fix linux build in NTFS fs (#18814)
Browse files Browse the repository at this point in the history
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.
  • Loading branch information
bansan85 authored Jul 6, 2021
1 parent 1d39c6f commit fc6d2ed
Show file tree
Hide file tree
Showing 4 changed files with 11 additions and 3 deletions.
6 changes: 4 additions & 2 deletions ports/catch2/portfile.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand Down
1 change: 1 addition & 0 deletions ports/catch2/vcpkg.json
Original file line number Diff line number Diff line change
@@ -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"
}
2 changes: 1 addition & 1 deletion versions/baseline.json
Original file line number Diff line number Diff line change
Expand Up @@ -1146,7 +1146,7 @@
},
"catch2": {
"baseline": "2.13.6",
"port-version": 0
"port-version": 1
},
"cccapstone": {
"baseline": "9b4128ee1153e78288a1b5433e2c06a0d47a4c4e-1",
Expand Down
5 changes: 5 additions & 0 deletions versions/c-/catch2.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "bd73b1d5e8994fb0327c333cd77400577f05e31c",
"version-semver": "2.13.6",
"port-version": 1
},
{
"git-tree": "17d502dbaa50c2e6d255331addb14259372fb6c5",
"version-semver": "2.13.6",
Expand Down

0 comments on commit fc6d2ed

Please sign in to comment.