Merge pull request #588 from PowerShell/cmake

Fix current working directory for CMake
2026-06-08 12:12:50 +00:00 · 2016-02-24 15:15:12 -08:00
parent 7047041404 91456111bf
commit 22a33fb92c
1 changed files with 10 additions and 3 deletions
@@ -44,9 +44,16 @@ function Start-PSBuild
        $Native = "$PSScriptRoot/src/libpsl-native"
        $Lib = "$Native/src/libpsl-native.$Ext"
        Write-Host "Building $Lib"
-        cmake -DCMAKE_BUILD_TYPE=Debug $Native
-        make -j -C $Native
-        make -C $Native test
+
+        try {
+            pushd $Native
+            cmake -DCMAKE_BUILD_TYPE=Debug .
+            make -j
+            make test
+        } finally {
+            popd
+        }
+
        if (-Not (Test-Path $Lib)) { throw "Compilation of $Lib failed" }
        cp $Lib $Output
    }