Skip to content

Commit

Permalink
[vcpkg-cmake] Fix typo in vcpkg_cmake_configure that prevented custom…
Browse files Browse the repository at this point in the history
… triplets from working (#16468)

* Fix typo in vcpkg_cmake_configure that prevented custom triplets from working

* Bump version

* Update baseline

* Update versions file
  • Loading branch information
sylveon committed Mar 1, 2021
1 parent a6043e4 commit 94db0dc
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 3 deletions.
2 changes: 1 addition & 1 deletion ports/vcpkg-cmake/vcpkg.json
@@ -1,4 +1,4 @@
{
"name": "vcpkg-cmake",
"version-date": "2021-02-26"
"version-date": "2021-02-28"
}
2 changes: 1 addition & 1 deletion ports/vcpkg-cmake/vcpkg_cmake_configure.cmake
Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion versions/baseline.json
Expand Up @@ -6113,7 +6113,7 @@
"port-version": 0
},
"vcpkg-cmake": {
"baseline": "2021-02-26",
"baseline": "2021-02-28",
"port-version": 0
},
"vcpkg-cmake-config": {
Expand Down
5 changes: 5 additions & 0 deletions 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",
Expand Down

0 comments on commit 94db0dc

Please sign in to comment.