[vcpkg] Do not build tests when running scripts\bootstrap.ps1.

This commit is contained in:
Robert Schumacher 2017-01-25 15:05:30 -08:00
parent 3d1b72ea05
commit d04e78815a
2 changed files with 23 additions and 1 deletions

View File

@ -26,7 +26,7 @@ try{
$msbuildExeWithPlatformToolset = & $scriptsDir\findAnyMSBuildWithCppPlatformToolset.ps1 $msbuildExeWithPlatformToolset = & $scriptsDir\findAnyMSBuildWithCppPlatformToolset.ps1
$msbuildExe = $msbuildExeWithPlatformToolset[0] $msbuildExe = $msbuildExeWithPlatformToolset[0]
$platformToolset = $msbuildExeWithPlatformToolset[1] $platformToolset = $msbuildExeWithPlatformToolset[1]
& $msbuildExe "/p:VCPKG_VERSION=-$gitHash" "/p:DISABLE_METRICS=$disableMetrics" /p:Configuration=Release /p:Platform=x86 /p:PlatformToolset=$platformToolset /m & $msbuildExe "/p:VCPKG_VERSION=-$gitHash" "/p:DISABLE_METRICS=$disableMetrics" /p:Configuration=Release /p:Platform=x86 /p:PlatformToolset=$platformToolset /m dirs.proj
Write-Verbose("Placing vcpkg.exe in the correct location") Write-Verbose("Placing vcpkg.exe in the correct location")

22
toolsrc/dirs.proj Normal file
View File

@ -0,0 +1,22 @@
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<SolutionDir>$(MSBuildThisFileDirectory)</SolutionDir>
</PropertyGroup>
<ItemGroup>
<ProjectFile Include="vcpkg\vcpkg.vcxproj"/>
<ProjectFile Include="vcpkglib\vcpkglib.vcxproj"/>
<ProjectFile Include="vcpkgcommon\vcpkgcommon.vcxproj"/>
<ProjectFile Include="vcpkgmetrics\vcpkgmetrics.vcxproj"/>
<ProjectFile Include="vcpkgmetricsuploader\vcpkgmetricsuploader.vcxproj"/>
</ItemGroup>
<Target Name="Rebuild" DependsOnTargets="Clean;Build" />
<Target Name="Build">
<MSBuild Projects="@(ProjectFile)" Properties="SolutionDir=$(SolutionDir)" Targets="Build"/>
</Target>
<Target Name="Clean">
<MSBuild Projects="@(ProjectFile)" Properties="SolutionDir=$(SolutionDir)" Targets="Clean"/>
</Target>
</Project>