aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCharles Milette <charles.milette@gmail.com>2021-03-01 14:49:24 -0500
committerGitHub <noreply@github.com>2021-03-01 11:49:24 -0800
commit94db0dc3a082aff5701dde9bea05d022199f2be9 (patch)
tree93dcd6e1b7e6f0e273893df1570d71ef547a3898
parenta6043e4fd21c600bd1fefe6afd300e41c763f74a (diff)
downloadvcpkg-94db0dc3a082aff5701dde9bea05d022199f2be9.tar.gz
vcpkg-94db0dc3a082aff5701dde9bea05d022199f2be9.zip
[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
-rw-r--r--ports/vcpkg-cmake/vcpkg.json2
-rw-r--r--ports/vcpkg-cmake/vcpkg_cmake_configure.cmake2
-rw-r--r--versions/baseline.json2
-rw-r--r--versions/v-/vcpkg-cmake.json5
4 files changed, 8 insertions, 3 deletions
diff --git a/ports/vcpkg-cmake/vcpkg.json b/ports/vcpkg-cmake/vcpkg.json
index cc7a12c04..029b7d6eb 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 a7d96dbc3..9f49a7d5c 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 b5e33e41a..fa800c001 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 8a24cb316..b93fc7508 100644
--- a/versions/v-/vcpkg-cmake.json
+++ b/versions/v-/vcpkg-cmake.json
@@ -1,6 +1,11 @@
{
"versions": [
{
+ "git-tree": "b627b47898864ee5a880cea03b4dea64b9d81953",
+ "version-date": "2021-02-28",
+ "port-version": 0
+ },
+ {
"git-tree": "51896aa8073adb5c8450daa423d03eedf0dfc61f",
"version-date": "2021-02-26",
"port-version": 0