From c47e933a60d8012a269283105b724523819e3ada Mon Sep 17 00:00:00 2001
From: "B. Scott Michel" <scooter.phd@gmail.com>
Date: Fri, 23 Feb 2024 10:47:24 -0800
Subject: [PATCH] CMake: Reduce excess quoting

cmake/cmake-builder.ps1 added quotes to arguments that contained spaces,
so that arguments printed correctly for progress output. This introduced
excess quotes that caused CMake (and likely other MS apps) confusion or
argument misinterpretation.

Instead of CMake seeing a single "Visual Studio 17 2022", CMake was
actually seeing "\"Visual Studio 17 2022\"".

This patch only adds the additional quotes when reporting progress or
emitting debug output. Otherwise, command line arguments are passed
unmolested.
---
 cmake/cmake-builder.ps1 | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/cmake/cmake-builder.ps1 b/cmake/cmake-builder.ps1
index 947ca3e1..2e67676d 100644
--- a/cmake/cmake-builder.ps1
+++ b/cmake/cmake-builder.ps1
@@ -495,14 +495,14 @@ foreach ($phase in $scriptPhases) {
             Write-Host "** ${scriptName}: Configuring and generating"
 
             $phaseCommand = ${cmakeCmd}
-            $argList = Quote-Args $generateArgs
+            $argList = $generateArgs
         }
 
         "build" {
             Write-Host "** ${scriptName}: Building simulators."
 
             $phaseCommand = ${cmakeCmd}
-            $argList = $(Quote-Args $buildArgs) + $(Quote-Args $buildSpecificArgs)
+            $argList = $buildArgs + $buildSpecificArgs
         }
 
         "test" {
@@ -529,7 +529,7 @@ foreach ($phase in $scriptPhases) {
             }
          
             $phaseCommand = ${ctestCmd}
-            $argList = Quote-Args $testArgs
+            $argList = $testArgs
 
             $env:PATH = $modPath
 
@@ -556,13 +556,13 @@ foreach ($phase in $scriptPhases) {
             }
 
             $phaseCommand = ${cmakeCmd}
-            $argList = Quote-Args @( "--install", "${buildDir}", "--config", "${config}")
+            $argList = @( "--install", "${buildDir}", "--config", "${config}")
         }
     }
 
     try {
         Push-Location ${buildDir}
-        Write-Host "** ${phaseCommand} ${argList}"
+        Write-Host "** ${phaseCommand} $(Quote-Args ${argList})"
         & $phaseCommand @arglist
         if ($LastExitCode -gt 0) {
             $printPhase = (Get-Culture).TextInfo.ToTitleCase($phase)