aboutsummaryrefslogtreecommitdiff
path: root/scripts/findAnyMSBuildWithCppPlatformToolset.ps1
diff options
context:
space:
mode:
authorAlexander Karatarakis <alkarata@microsoft.com>2017-02-24 16:36:10 -0800
committerAlexander Karatarakis <alkarata@microsoft.com>2017-02-24 16:36:10 -0800
commit58002f62392f15a42a8b30352aa007bbd82e74a9 (patch)
tree88344043f9ebce2a0553a5746f9e9ca8f592e5e2 /scripts/findAnyMSBuildWithCppPlatformToolset.ps1
parent789f26c741b1a02d4fc2a6ed5a3910b2853f6e3a (diff)
downloadvcpkg-58002f62392f15a42a8b30352aa007bbd82e74a9.tar.gz
vcpkg-58002f62392f15a42a8b30352aa007bbd82e74a9.zip
Tweak -Verbose messages
Diffstat (limited to 'scripts/findAnyMSBuildWithCppPlatformToolset.ps1')
-rw-r--r--scripts/findAnyMSBuildWithCppPlatformToolset.ps114
1 files changed, 8 insertions, 6 deletions
diff --git a/scripts/findAnyMSBuildWithCppPlatformToolset.ps1 b/scripts/findAnyMSBuildWithCppPlatformToolset.ps1
index 6ee368a54..f1ef1ae6b 100644
--- a/scripts/findAnyMSBuildWithCppPlatformToolset.ps1
+++ b/scripts/findAnyMSBuildWithCppPlatformToolset.ps1
@@ -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 })