File tree Expand file tree Collapse file tree 1 file changed +3
-2
lines changed Expand file tree Collapse file tree 1 file changed +3
-2
lines changed Original file line number Diff line number Diff line change @@ -818,7 +818,7 @@ function find_vs() {
818
818
819
819
# refer: https://learn.microsoft.com/en-us/visualstudio/install/workload-and-component-ids?view=vs-2022
820
820
$require_comps = @ (' Microsoft.VisualStudio.Component.VC.Tools.x86.x64' , ' Microsoft.VisualStudio.Product.BuildTools' )
821
- $vs_installs = ConvertFrom-Json " $ ( & $VSWHERE_EXE - version $required_vs_ver.TrimEnd (' +' ) - format ' json' - requires $require_comps - requiresAny) "
821
+ $vs_installs = ConvertFrom-Json " $ ( & $VSWHERE_EXE - version $required_vs_ver.TrimEnd (' +' ) - format ' json' - requires $require_comps - requiresAny - prerelease ) "
822
822
$ErrorActionPreference = $eap
823
823
824
824
if ($vs_installs ) {
@@ -2026,12 +2026,12 @@ if (!$setupOnly) {
2026
2026
if (($cmake_generator -eq ' Xcode' ) -and ! $BUILD_ALL_OPTIONS.Contains (' --verbose' )) {
2027
2027
$forward_options += ' --' , ' -quiet'
2028
2028
}
2029
- $1k.println (" cmake --build $BUILD_DIR $BUILD_ALL_OPTIONS " )
2030
2029
2031
2030
if ($options.t ) { $cmake_target = $options.t }
2032
2031
if ($cmake_target ) {
2033
2032
$cmake_targets = $cmake_target.Split (' ,' ) | Sort-Object | Get-Unique
2034
2033
foreach ($target in $cmake_targets ) {
2034
+ $1k.println (" cmake --build $BUILD_DIR $BUILD_ALL_OPTIONS --target $target " )
2035
2035
cmake -- build $BUILD_DIR $BUILD_ALL_OPTIONS -- target $target $forward_options | Out-Host
2036
2036
if (! $? ) {
2037
2037
Set-Location $stored_cwd
@@ -2040,6 +2040,7 @@ if (!$setupOnly) {
2040
2040
}
2041
2041
}
2042
2042
else {
2043
+ $1k.println (" cmake --build $BUILD_DIR $BUILD_ALL_OPTIONS " )
2043
2044
cmake -- build $BUILD_DIR $BUILD_ALL_OPTIONS $forward_options | Out-Host
2044
2045
if (! $? ) {
2045
2046
Set-Location $stored_cwd
You can’t perform that action at this time.
0 commit comments