From 286bc1c7f144c16d7f0ee444b699dc8e945794e4 Mon Sep 17 00:00:00 2001 From: Joshua Goins Date: Thu, 25 Apr 2024 17:47:41 -0400 Subject: [PATCH] Fix extra CMake arguments not getting passed I guess $Args is some kind of protected keyword, because it doesn't work --- scripts/windows-setup.ps1 | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/scripts/windows-setup.ps1 b/scripts/windows-setup.ps1 index 716ea65..af80912 100644 --- a/scripts/windows-setup.ps1 +++ b/scripts/windows-setup.ps1 @@ -8,8 +8,10 @@ $LocalDir = "./local" $BuildDir = "$LocalDir/build" $PrefixDir = (Get-Location).Path + "/prefix" -function Configure($Name, $Args = "") { - cmake -B "$BuildDir-$Name" "-DCMAKE_PREFIX_PATH=$PrefixDir" "-DCMAKE_CXX_COMPILER=cl" "-DCMAKE_C_COMPILER=cl" "-DCMAKE_BUILD_TYPE=Debug" "-S" "$LocalDir/$Name" "-DCMAKE_INSTALL_PREFIX=$PrefixDir" $Args +function Configure($Name, $ExtraArgs = "") { + $Command = "cmake -B $BuildDir-$Name -DCMAKE_PREFIX_PATH=$PrefixDir -DCMAKE_CXX_COMPILER=cl -DCMAKE_C_COMPILER=cl -DCMAKE_BUILD_TYPE=Debug -S $LocalDir/$Name -DCMAKE_INSTALL_PREFIX=$PrefixDir $ExtraArgs" + Write-Output "Running $Command" + Invoke-Expression $Command if ($LASTEXITCODE -ne 0) { throw "Failed to configure $Name" }