From 57c08a3223a1ec03c3a31986ee38d32e90b6039c Mon Sep 17 00:00:00 2001 From: Lily Wang <94091114+LilyWangLL@users.noreply.github.com> Date: Sat, 25 Jan 2025 17:29:59 +0800 Subject: [PATCH] [vcpkg-make] Fix the missing value (#43121) --- ports/vcpkg-make/vcpkg.json | 1 + ports/vcpkg-make/vcpkg_scripts.cmake | 4 ++-- versions/baseline.json | 2 +- versions/v-/vcpkg-make.json | 5 +++++ 4 files changed, 9 insertions(+), 3 deletions(-) diff --git a/ports/vcpkg-make/vcpkg.json b/ports/vcpkg-make/vcpkg.json index ecf88b73a2239a..783f116adcdfd6 100644 --- a/ports/vcpkg-make/vcpkg.json +++ b/ports/vcpkg-make/vcpkg.json @@ -1,6 +1,7 @@ { "name": "vcpkg-make", "version-date": "2025-01-13", + "port-version": 1, "documentation": "https://learn.microsoft.com/vcpkg/maintainers/functions/vcpkg_make_configure", "license": null, "supports": "native", diff --git a/ports/vcpkg-make/vcpkg_scripts.cmake b/ports/vcpkg-make/vcpkg_scripts.cmake index 49756d7922dd6c..6489635a8ca187 100644 --- a/ports/vcpkg-make/vcpkg_scripts.cmake +++ b/ports/vcpkg-make/vcpkg_scripts.cmake @@ -123,7 +123,7 @@ function(z_vcpkg_set_global_property property value) if(NOT ARGN STREQUAL "" AND NOT ARGN MATCHES "^APPEND(_STRING)?$") message(FATAL_ERROR "'${CMAKE_CURRENT_FUNCTION}' called with invalid arguments '${ARGN}'") endif() - set_property(GLOBAL ${ARGN} PROPERTY "z_vcpkg_global_property_${property}" ${value}) + set_property(GLOBAL ${ARGN} PROPERTY "z_vcpkg_global_property_${property}" "${value}") endfunction() function(z_vcpkg_get_global_property outvar property) @@ -171,7 +171,7 @@ function(vcpkg_restore_pkgconfig) if(has_backup) z_vcpkg_get_global_property(backup "make-pkg-config-backup-${envvar}") set("ENV{${envvar}}" "${backup}") - z_vcpkg_set_global_property("make-pkg-config-backup-${envvar}") + z_vcpkg_set_global_property("make-pkg-config-backup-${envvar}" "") else() unset("ENV{${envvar}}") endif() diff --git a/versions/baseline.json b/versions/baseline.json index 1a71076b62cd56..fe96503080ef4b 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -9406,7 +9406,7 @@ }, "vcpkg-make": { "baseline": "2025-01-13", - "port-version": 0 + "port-version": 1 }, "vcpkg-msbuild": { "baseline": "2023-08-08", diff --git a/versions/v-/vcpkg-make.json b/versions/v-/vcpkg-make.json index a840346820ff3b..4e532326a3956c 100644 --- a/versions/v-/vcpkg-make.json +++ b/versions/v-/vcpkg-make.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "276b846fcad524729ffbf6fe1c8b7598cfeac91a", + "version-date": "2025-01-13", + "port-version": 1 + }, { "git-tree": "5af3456c1f7742c9d880d70dc678c061b91668c1", "version-date": "2025-01-13",