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

[vcxproj] Explicitly specify intermediate and output directories

Browse Source 
Avoids case-sensitivity issues, flattens the layout, no Win32 but x86 instead
Issue #4586
This commit is contained in:
Alexander Karatarakis 2018-10-30 16:40:38 -07:00
parent 0ad199727e
commit 5a1a75d2d6
7 changed files with 71 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.gitignore vendored
View File

@ -284,6 +284,10 @@ __pycache__/
/packages/
/scripts/buildsystems/tmp/
/toolsrc/build.rel/
/toolsrc/msbuild.x86.debug/
/toolsrc/msbuild.x86.release/
/toolsrc/msbuild.x64.debug/
/toolsrc/msbuild.x64.release/
#ignore custom triplets
/triplets/*
#add vcpkg-designed triplets back in

4
scripts/bootstrap.ps1
View File

@ -328,7 +328,7 @@ if ($disableMetrics)
}
$platform = "x86"
$vcpkgReleaseDir = "$vcpkgSourcesPath\release"
$vcpkgReleaseDir = "$vcpkgSourcesPath\msbuild.x86.release"
if ($win64)
{
@ -339,7 +339,7 @@ if ($win64)
}
$platform = "x64"
$vcpkgReleaseDir = "$vcpkgSourcesPath\x64\release"
$vcpkgReleaseDir = "$vcpkgSourcesPath\msbuild.x64.release"
}
$arguments = (

2
toolsrc/dirs.proj
View File

@ -3,8 +3,8 @@
<SolutionDir>$(MSBuildThisFileDirectory)</SolutionDir>
</PropertyGroup>
<ItemGroup>
<ProjectFile Include="vcpkg\vcpkg.vcxproj"/>
<ProjectFile Include="vcpkglib\vcpkglib.vcxproj"/>
<ProjectFile Include="vcpkg\vcpkg.vcxproj"/>
<ProjectFile Include="vcpkgmetricsuploader\vcpkgmetricsuploader.vcxproj"/>
</ItemGroup>

17
toolsrc/vcpkg/vcpkg.vcxproj
View File

@ -53,7 +53,22 @@
<ImportGroup Label="Shared">
</ImportGroup>
<PropertyGroup Label="UserMacros" />
<PropertyGroup />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<IntDir>$(SolutionDir)msbuild.x86.debug\$(ProjectName)\</IntDir>
<OutDir>$(SolutionDir)msbuild.x86.debug\</OutDir>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<OutDir>$(SolutionDir)msbuild.x86.release\</OutDir>
<IntDir>$(SolutionDir)msbuild.x86.release\$(ProjectName)\</IntDir>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<IntDir>$(SolutionDir)msbuild.x64.debug\$(ProjectName)\</IntDir>
<OutDir>$(SolutionDir)msbuild.x64.debug\</OutDir>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<IntDir>$(SolutionDir)msbuild.x64.release\$(ProjectName)\</IntDir>
<OutDir>$(SolutionDir)msbuild.x64.release\</OutDir>
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ClCompile>
<WarningLevel>Level4</WarningLevel>

17
toolsrc/vcpkglib/vcpkglib.vcxproj
View File

@ -56,7 +56,22 @@
<ImportGroup Label="Shared">
</ImportGroup>
<PropertyGroup Label="UserMacros" />
<PropertyGroup />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<IntDir>$(SolutionDir)msbuild.x86.debug\$(ProjectName)\</IntDir>
<OutDir>$(SolutionDir)msbuild.x86.debug\</OutDir>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<OutDir>$(SolutionDir)msbuild.x86.release\</OutDir>
<IntDir>$(SolutionDir)msbuild.x86.release\$(ProjectName)\</IntDir>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<IntDir>$(SolutionDir)msbuild.x64.debug\$(ProjectName)\</IntDir>
<OutDir>$(SolutionDir)msbuild.x64.debug\</OutDir>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<IntDir>$(SolutionDir)msbuild.x64.release\$(ProjectName)\</IntDir>
<OutDir>$(SolutionDir)msbuild.x64.release\</OutDir>
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ClCompile>
<WarningLevel>Level3</WarningLevel>

17
toolsrc/vcpkgmetricsuploader/vcpkgmetricsuploader.vcxproj
View File

@ -53,7 +53,22 @@
<ImportGroup Label="Shared">
</ImportGroup>
<PropertyGroup Label="UserMacros" />
<PropertyGroup />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<IntDir>$(SolutionDir)msbuild.x86.debug\$(ProjectName)\</IntDir>
<OutDir>$(SolutionDir)msbuild.x86.debug\</OutDir>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<OutDir>$(SolutionDir)msbuild.x86.release\</OutDir>
<IntDir>$(SolutionDir)msbuild.x86.release\$(ProjectName)\</IntDir>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<IntDir>$(SolutionDir)msbuild.x64.debug\$(ProjectName)\</IntDir>
<OutDir>$(SolutionDir)msbuild.x64.debug\</OutDir>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<IntDir>$(SolutionDir)msbuild.x64.release\$(ProjectName)\</IntDir>
<OutDir>$(SolutionDir)msbuild.x64.release\</OutDir>
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ClCompile>
<WarningLevel>Level3</WarningLevel>

16
toolsrc/vcpkgtest/vcpkgtest.vcxproj
View File

@ -84,6 +84,22 @@
<ImportGroup Label="Shared">
</ImportGroup>
<PropertyGroup Label="UserMacros" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<IntDir>$(SolutionDir)msbuild.x86.debug\$(ProjectName)\</IntDir>
<OutDir>$(SolutionDir)msbuild.x86.debug\</OutDir>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<OutDir>$(SolutionDir)msbuild.x86.release\</OutDir>
<IntDir>$(SolutionDir)msbuild.x86.release\$(ProjectName)\</IntDir>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<IntDir>$(SolutionDir)msbuild.x64.debug\$(ProjectName)\</IntDir>
<OutDir>$(SolutionDir)msbuild.x64.debug\</OutDir>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<IntDir>$(SolutionDir)msbuild.x64.release\$(ProjectName)\</IntDir>
<OutDir>$(SolutionDir)msbuild.x64.release\</OutDir>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<LinkIncremental>true</LinkIncremental>
</PropertyGroup>