3party/vcpkg
0
0
Fork 0
mirror of https://github.com/microsoft/vcpkg.git synced 2024-12-27 10:21:07 +08:00
Code Issues Projects Releases Wiki Activity

Tweak -Verbose messages

Browse Source
This commit is contained in:
Alexander Karatarakis 2017-02-24 16:36:10 -08:00
parent 789f26c741
commit 58002f6239
2 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
scripts/findAnyMSBuildWithCppPlatformToolset.ps1
View File

@ -54,12 +54,16 @@ foreach ($ProgramFiles in $CandidateProgramFiles)
{
$clExe= "$ProgramFiles\Microsoft Visual Studio 14.0\VC\bin\cl.exe"
if (Test-Path $clExe)
if (!(Test-Path $clExe))
{
$instance = New-MSBuildInstance "$ProgramFiles\MSBuild\14.0\Bin\MSBuild.exe" "v140"
Write-Verbose "Found $instance"
$validInstances.Add($instance) > $null
Write-Verbose "$clExe - Not Found"
continue
}
Write-Verbose "$clExe - Found"
$instance = New-MSBuildInstance "$ProgramFiles\MSBuild\14.0\Bin\MSBuild.exe" "v140"
Write-Verbose "Found $instance"
$validInstances.Add($instance) > $null
}
# VS2015 - through the registry
@ -84,7 +88,6 @@ $(NewCppRegistryPair "Registry::HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\visualstud
foreach ($pair in $registryPairs)
{
$vsEntry = $pair.visualStudioEntry
Write-Verbose "$vsEntry - Checking"
try
{
$VS14InstallDir = $(gp $vsEntry InstallDir -erroraction Stop | % { $_.InstallDir })
@ -112,7 +115,6 @@ foreach ($pair in $registryPairs)
Write-Verbose "$clExePath - Found"
$msbuildEntry = $pair.msBuildEntry
Write-Verbose "$msbuildEntry - Checking"
try
{
$MSBuild14 = $(gp $msbuildEntry MSBuildToolsPath -erroraction Stop | % { $_.MSBuildToolsPath })

3
scripts/getWindowsSDK.ps1
View File

@ -26,7 +26,6 @@ Write-Verbose "Looking for Windows 10 SDK"
foreach ($ProgramFiles in $CandidateProgramFiles)
{
$folder = "$ProgramFiles\Windows Kits\10\Include"
Write-Verbose "$folder - Checking"
if (!(Test-Path $folder))
{
Write-Verbose "$folder - Not Found"
@ -40,7 +39,6 @@ foreach ($ProgramFiles in $CandidateProgramFiles)
foreach ($win10sdkV in $win10sdkVersions)
{
$windowsheader = "$folder\$win10sdkV\um\windows.h"
Write-Verbose "$windowsheader - Checking"
if (!(Test-Path $windowsheader))
{
Write-Verbose "$windowsheader - Not Found"
@ -60,7 +58,6 @@ Write-Verbose "Looking for Windows 8.1 SDK"
foreach ($ProgramFiles in $CandidateProgramFiles)
{
$folder = "$ProgramFiles\Windows Kits\8.1\Include"
Write-Verbose "$folder - Checking"
if (!(Test-Path $folder))
{
Write-Verbose "$folder - Not Found"