From 042e1db92d115819bba6bffd681a174543111139 Mon Sep 17 00:00:00 2001 From: Phoebe <20694052+PhoebeHui@users.noreply.github.com> Date: Tue, 28 Sep 2021 12:11:50 +0800 Subject: [PATCH] [vcpkg_cmake_config_fixup] Fix variable name (#20380) * [vcpkg_cmake_config_fixup] Fix variable name * Fix vcpkg.json --- ports/vcpkg-cmake-config/vcpkg.json | 3 +-- ports/vcpkg-cmake-config/vcpkg_cmake_config_fixup.cmake | 2 +- versions/baseline.json | 4 ++-- versions/v-/vcpkg-cmake-config.json | 5 +++++ 4 files changed, 9 insertions(+), 5 deletions(-) diff --git a/ports/vcpkg-cmake-config/vcpkg.json b/ports/vcpkg-cmake-config/vcpkg.json index 49faaf4d40..749114aa4d 100644 --- a/ports/vcpkg-cmake-config/vcpkg.json +++ b/ports/vcpkg-cmake-config/vcpkg.json @@ -1,5 +1,4 @@ { "name": "vcpkg-cmake-config", - "version-date": "2021-05-22", - "port-version": 1 + "version-date": "2021-09-27" } diff --git a/ports/vcpkg-cmake-config/vcpkg_cmake_config_fixup.cmake b/ports/vcpkg-cmake-config/vcpkg_cmake_config_fixup.cmake index a145d324a9..7a7a6c833b 100644 --- a/ports/vcpkg-cmake-config/vcpkg_cmake_config_fixup.cmake +++ b/ports/vcpkg-cmake-config/vcpkg_cmake_config_fixup.cmake @@ -216,7 +216,7 @@ get_filename_component(_IMPORT_PREFIX "${_IMPORT_PREFIX}" PATH)]] # Patch out any remaining absolute references file(TO_CMAKE_PATH "${CURRENT_PACKAGES_DIR}" cmake_current_packages_dir) - string(REPLACE "${CMAKE_CURRENT_PACKAGES_DIR}" [[${_IMPORT_PREFIX}]] contents "${contents}") + string(REPLACE "${cmake_current_packages_dir}" [[${_IMPORT_PREFIX}]] contents "${contents}") file(WRITE "${main_cmake}" "${contents}") endforeach() diff --git a/versions/baseline.json b/versions/baseline.json index b289975a8b..3500c7d698 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -6849,8 +6849,8 @@ "port-version": 0 }, "vcpkg-cmake-config": { - "baseline": "2021-05-22", - "port-version": 1 + "baseline": "2021-09-27", + "port-version": 0 }, "vcpkg-gfortran": { "baseline": "3", diff --git a/versions/v-/vcpkg-cmake-config.json b/versions/v-/vcpkg-cmake-config.json index 2561cfa3f2..cff03bb75d 100644 --- a/versions/v-/vcpkg-cmake-config.json +++ b/versions/v-/vcpkg-cmake-config.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "9ae99981abcd01b092344f85ef6e1de3c1f9856a", + "version-date": "2021-09-27", + "port-version": 0 + }, { "git-tree": "330cc51bc99c6b71ed5fb51901f6f838684015a5", "version-date": "2021-05-22",