From 94db0dc3a082aff5701dde9bea05d022199f2be9 Mon Sep 17 00:00:00 2001 From: Charles Milette Date: Mon, 1 Mar 2021 14:49:24 -0500 Subject: [PATCH] [vcpkg-cmake] Fix typo in vcpkg_cmake_configure that prevented custom triplets from working (#16468) * Fix typo in vcpkg_cmake_configure that prevented custom triplets from working * Bump version * Update baseline * Update versions file --- ports/vcpkg-cmake/vcpkg.json | 2 +- ports/vcpkg-cmake/vcpkg_cmake_configure.cmake | 2 +- versions/baseline.json | 2 +- versions/v-/vcpkg-cmake.json | 5 +++++ 4 files changed, 8 insertions(+), 3 deletions(-) diff --git a/ports/vcpkg-cmake/vcpkg.json b/ports/vcpkg-cmake/vcpkg.json index cc7a12c04f835a..029b7d6eb3f933 100644 --- a/ports/vcpkg-cmake/vcpkg.json +++ b/ports/vcpkg-cmake/vcpkg.json @@ -1,4 +1,4 @@ { "name": "vcpkg-cmake", - "version-date": "2021-02-26" + "version-date": "2021-02-28" } diff --git a/ports/vcpkg-cmake/vcpkg_cmake_configure.cmake b/ports/vcpkg-cmake/vcpkg_cmake_configure.cmake index a7d96dbc3dbee8..9f49a7d5c79717 100644 --- a/ports/vcpkg-cmake/vcpkg_cmake_configure.cmake +++ b/ports/vcpkg-cmake/vcpkg_cmake_configure.cmake @@ -222,7 +222,7 @@ function(vcpkg_cmake_configure) endif() z_vcpkg_cmake_configure_both_set_or_unset(VCPKG_CXX_FLAGS_DEBUG VCPKG_C_FLAGS_DEBUG) - z_vcpkg_cmake_configure_both_set_or_unset(VCPKG_CXX_FLAGS_RELEASE VCPKG_C_FLAGS_RELASE) + z_vcpkg_cmake_configure_both_set_or_unset(VCPKG_CXX_FLAGS_RELEASE VCPKG_C_FLAGS_RELEASE) z_vcpkg_cmake_configure_both_set_or_unset(VCPKG_CXX_FLAGS VCPKG_C_FLAGS) set(VCPKG_SET_CHARSET_FLAG ON) diff --git a/versions/baseline.json b/versions/baseline.json index b5e33e41a5b05b..fa800c001f02e8 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -6113,7 +6113,7 @@ "port-version": 0 }, "vcpkg-cmake": { - "baseline": "2021-02-26", + "baseline": "2021-02-28", "port-version": 0 }, "vcpkg-cmake-config": { diff --git a/versions/v-/vcpkg-cmake.json b/versions/v-/vcpkg-cmake.json index 8a24cb3160b45c..b93fc75088ccc4 100644 --- a/versions/v-/vcpkg-cmake.json +++ b/versions/v-/vcpkg-cmake.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "b627b47898864ee5a880cea03b4dea64b9d81953", + "version-date": "2021-02-28", + "port-version": 0 + }, { "git-tree": "51896aa8073adb5c8450daa423d03eedf0dfc61f", "version-date": "2021-02-26",