From 5d951426706d22d35d166c6f21b8ef1498f1d46c Mon Sep 17 00:00:00 2001
From: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com>
Date: Mon, 11 Mar 2024 20:39:47 -0700
Subject: [PATCH] [sdformat6/sdformat9/sdformat10]sets correct environment
 variable (#37370)

Fixes #37338

Fix error:
````
CMake Warning (dev) at ports/sdformat6/portfile.cmake:30 (set):
  Only the first value argument is used when setting an environment variable.
  Argument 'C:\Program Files\Microsoft Visual
  Studio\2022\Enterprise\Common7\IDE\VC\VCPackages' and later are unused.
````
---
 ports/sdformat10/portfile.cmake | 2 +-
 ports/sdformat10/vcpkg.json     | 2 +-
 ports/sdformat6/portfile.cmake  | 2 +-
 ports/sdformat6/vcpkg.json      | 2 +-
 ports/sdformat9/portfile.cmake  | 2 +-
 ports/sdformat9/vcpkg.json      | 2 +-
 versions/baseline.json          | 6 +++---
 versions/s-/sdformat10.json     | 5 +++++
 versions/s-/sdformat6.json      | 5 +++++
 versions/s-/sdformat9.json      | 5 +++++
 10 files changed, 24 insertions(+), 9 deletions(-)

diff --git a/ports/sdformat10/portfile.cmake b/ports/sdformat10/portfile.cmake
index 0d4c0f623c..c09eac6f8e 100644
--- a/ports/sdformat10/portfile.cmake
+++ b/ports/sdformat10/portfile.cmake
@@ -27,7 +27,7 @@ vcpkg_cmake_configure(
 vcpkg_cmake_install()
 
 # Restore original path
-set(ENV{PATH} ${_path})
+set(ENV{PATH} "${_path}")
 
 # Fix cmake targets and pkg-config file location
 vcpkg_cmake_config_fixup(CONFIG_PATH "lib/cmake/sdformat10")
diff --git a/ports/sdformat10/vcpkg.json b/ports/sdformat10/vcpkg.json
index 5f4761dfc8..072cfe744d 100644
--- a/ports/sdformat10/vcpkg.json
+++ b/ports/sdformat10/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "sdformat10",
   "version": "10.0.0",
-  "port-version": 3,
+  "port-version": 4,
   "description": "Simulation Description Format (SDF) parser and description files.",
   "homepage": "http://sdformat.org/",
   "supports": "!uwp & !(arm & osx)",
diff --git a/ports/sdformat6/portfile.cmake b/ports/sdformat6/portfile.cmake
index ef7c774c59..187ef75ce6 100644
--- a/ports/sdformat6/portfile.cmake
+++ b/ports/sdformat6/portfile.cmake
@@ -27,7 +27,7 @@ vcpkg_cmake_configure(
 vcpkg_cmake_install()
 
 # Restore original path
-set(ENV{PATH} ${_path})
+set(ENV{PATH} "${_path}")
 
 # Move location of sdformat.dll from lib to bin
 if(EXISTS "${CURRENT_PACKAGES_DIR}/lib/sdformat.dll")
diff --git a/ports/sdformat6/vcpkg.json b/ports/sdformat6/vcpkg.json
index c66f66a3c4..ea49b4a056 100644
--- a/ports/sdformat6/vcpkg.json
+++ b/ports/sdformat6/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "sdformat6",
   "version": "6.2.0",
-  "port-version": 6,
+  "port-version": 7,
   "description": "Simulation Description Format (SDF) parser and description files.",
   "homepage": "http://sdformat.org/",
   "license": "Apache-2.0",
diff --git a/ports/sdformat9/portfile.cmake b/ports/sdformat9/portfile.cmake
index 54d083a293..8875dcbe08 100644
--- a/ports/sdformat9/portfile.cmake
+++ b/ports/sdformat9/portfile.cmake
@@ -27,7 +27,7 @@ vcpkg_cmake_configure(
 vcpkg_cmake_install()
 
 # Restore original path
-set(ENV{PATH} ${_path})
+set(ENV{PATH} "${_path}")
 
 # Fix cmake targets and pkg-config file location
 vcpkg_cmake_config_fixup(CONFIG_PATH "lib/cmake/sdformat9")
diff --git a/ports/sdformat9/vcpkg.json b/ports/sdformat9/vcpkg.json
index 1abe244286..00b4a958b2 100644
--- a/ports/sdformat9/vcpkg.json
+++ b/ports/sdformat9/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "sdformat9",
   "version": "9.8.0",
-  "port-version": 1,
+  "port-version": 2,
   "description": "Simulation Description Format (SDF) parser and description files.",
   "homepage": "http://sdformat.org/",
   "license": "Apache-2.0",
diff --git a/versions/baseline.json b/versions/baseline.json
index 8f0ec5a399..9bd005e6bd 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -7854,7 +7854,7 @@
     },
     "sdformat10": {
       "baseline": "10.0.0",
-      "port-version": 3
+      "port-version": 4
     },
     "sdformat13": {
       "baseline": "13.5.0",
@@ -7862,11 +7862,11 @@
     },
     "sdformat6": {
       "baseline": "6.2.0",
-      "port-version": 6
+      "port-version": 7
     },
     "sdformat9": {
       "baseline": "9.8.0",
-      "port-version": 1
+      "port-version": 2
     },
     "sdl1": {
       "baseline": "1.2.15",
diff --git a/versions/s-/sdformat10.json b/versions/s-/sdformat10.json
index 7541db3a76..9093cf70ef 100644
--- a/versions/s-/sdformat10.json
+++ b/versions/s-/sdformat10.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "1784f42c65cd5b0919a9d6c338bf1ab4f6022a9b",
+      "version": "10.0.0",
+      "port-version": 4
+    },
     {
       "git-tree": "872ca568e5e49581fe0404d3422230d60b3d9710",
       "version": "10.0.0",
diff --git a/versions/s-/sdformat6.json b/versions/s-/sdformat6.json
index b30a5ca672..0dc784aba6 100644
--- a/versions/s-/sdformat6.json
+++ b/versions/s-/sdformat6.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "e05708a69e80e295caedf2c503461686cabb5d3b",
+      "version": "6.2.0",
+      "port-version": 7
+    },
     {
       "git-tree": "bdc0f927266aa4195c3795075c9e07c426c4556c",
       "version": "6.2.0",
diff --git a/versions/s-/sdformat9.json b/versions/s-/sdformat9.json
index e19b6ac97f..b083a4e37b 100644
--- a/versions/s-/sdformat9.json
+++ b/versions/s-/sdformat9.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "faa40ee4c041f6c5d34acbc85008b8f939befc62",
+      "version": "9.8.0",
+      "port-version": 2
+    },
     {
       "git-tree": "693fd5dc7bdb0dfe766275719f0b3f85477994aa",
       "version": "9.8.0",