jp9000
/
obs-studio
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

CI: Respect user-specified build directory 

The Windows build script would respect the user-specified build
directory for the configure step, but not for the build step. Fix that
by applying the same logic in Configure-OBS to Build-OBS.
master
Ryan Foster 2022-04-23 19:48:20 -04:00
parent ff58622df6
commit 4b078b9296
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CI/windows/02_build_obs.ps1
View File

@ -41,7 +41,9 @@ function Build-OBS {
Ensure-Directory ${CheckoutDir}
Write-Step "Build OBS targets..."
Invoke-Expression "cmake --build $(if($BuildArch -eq "x64") { "build64" } else { "build32" }) --config ${BuildConfiguration}"
$BuildDirectoryActual = "${BuildDirectory}$(if (${BuildArch} -eq "x64") { "64" } else { "32" })"
Invoke-Expression "cmake --build ${BuildDirectoryActual} --config ${BuildConfiguration}"
}
function Configure-OBS {