From ed2f8bda1a560d50a778fab74db9bc22f62cc1a2 Mon Sep 17 00:00:00 2001 From: LE GARREC Vincent Date: Mon, 5 Jul 2021 08:21:17 +0200 Subject: [PATCH] [catch2] Fix linux build in NTFS fs 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. --- ports/catch2/portfile.cmake | 6 ++++-- ports/catch2/vcpkg.json | 1 + versions/baseline.json | 2 +- 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 1d0291a5717b06..0b2c4c0e752208 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 ddca8ee6722333..e0199bffa190c2 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 a200b7aee8824e..48ec130e484d8b 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 a9aa348e991af0..cca4c3a0064f3d 100644 --- a/versions/c-/catch2.json +++ b/versions/c-/catch2.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "bd73b1d5e8994fb0327c333cd77400577f05e31c", + "version-semver": "2.13.6", + "port-version": 1 + }, { "git-tree": "17d502dbaa50c2e6d255331addb14259372fb6c5", "version-semver": "2.13.6",