[vcpkg-make] Fix the missing value (microsoft#43121)

applicate2628 · Jan 25, 2025 · 57c08a3 · 57c08a3
1 parent 2844a87
commit 57c08a3
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 3 deletions.
diff --git 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
@@ -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
@@ -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
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "276b846fcad524729ffbf6fe1c8b7598cfeac91a",
+      "version-date": "2025-01-13",
+      "port-version": 1
+    },
     {
       "git-tree": "5af3456c1f7742c9d880d70dc678c061b91668c1",
       "version-date": "2025-01-13",