diff options
| author | Alexander Karatarakis <alkarata@microsoft.com> | 2018-10-30 16:40:38 -0700 |
|---|---|---|
| committer | Alexander Karatarakis <alkarata@microsoft.com> | 2018-11-01 01:26:31 -0700 |
| commit | 5a1a75d2d6bb27675bca2f009c7ae5579e84cea7 (patch) | |
| tree | 11aeaf69c11d01fc2d2303c77de45f2bce2bad96 /toolsrc | |
| parent | 0ad199727ed99d6e3a08c8d16f345262c7031922 (diff) | |
| download | vcpkg-5a1a75d2d6bb27675bca2f009c7ae5579e84cea7.tar.gz vcpkg-5a1a75d2d6bb27675bca2f009c7ae5579e84cea7.zip | |
[vcxproj] Explicitly specify intermediate and output directories
Avoids case-sensitivity issues, flattens the layout, no Win32 but x86 instead
Issue #4586
Diffstat (limited to 'toolsrc')
| -rw-r--r-- | toolsrc/dirs.proj | 2 | ||||
| -rw-r--r-- | toolsrc/vcpkg/vcpkg.vcxproj | 17 | ||||
| -rw-r--r-- | toolsrc/vcpkglib/vcpkglib.vcxproj | 17 | ||||
| -rw-r--r-- | toolsrc/vcpkgmetricsuploader/vcpkgmetricsuploader.vcxproj | 17 | ||||
| -rw-r--r-- | toolsrc/vcpkgtest/vcpkgtest.vcxproj | 16 |
5 files changed, 65 insertions, 4 deletions
diff --git a/toolsrc/dirs.proj b/toolsrc/dirs.proj index 17d9fa1b0..7729c9897 100644 --- a/toolsrc/dirs.proj +++ b/toolsrc/dirs.proj @@ -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> diff --git a/toolsrc/vcpkg/vcpkg.vcxproj b/toolsrc/vcpkg/vcpkg.vcxproj index 349f8fbf7..8edea2244 100644 --- a/toolsrc/vcpkg/vcpkg.vcxproj +++ b/toolsrc/vcpkg/vcpkg.vcxproj @@ -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>
diff --git a/toolsrc/vcpkglib/vcpkglib.vcxproj b/toolsrc/vcpkglib/vcpkglib.vcxproj index 0cd3a9d25..8df9b5b9d 100644 --- a/toolsrc/vcpkglib/vcpkglib.vcxproj +++ b/toolsrc/vcpkglib/vcpkglib.vcxproj @@ -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>
diff --git a/toolsrc/vcpkgmetricsuploader/vcpkgmetricsuploader.vcxproj b/toolsrc/vcpkgmetricsuploader/vcpkgmetricsuploader.vcxproj index 26fed0ec2..e533d0e15 100644 --- a/toolsrc/vcpkgmetricsuploader/vcpkgmetricsuploader.vcxproj +++ b/toolsrc/vcpkgmetricsuploader/vcpkgmetricsuploader.vcxproj @@ -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>
diff --git a/toolsrc/vcpkgtest/vcpkgtest.vcxproj b/toolsrc/vcpkgtest/vcpkgtest.vcxproj index 6bb0e8020..4cda29461 100644 --- a/toolsrc/vcpkgtest/vcpkgtest.vcxproj +++ b/toolsrc/vcpkgtest/vcpkgtest.vcxproj @@ -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>
|