Global
/
vcpkg
mirror of https://github.com/microsoft/vcpkg.git
1
0
Fork 0
Code Activity

Fix issues with the integration file

This commit is contained in:
Alexander Karatarakis 2016-10-31 17:02:39 -07:00
parent b04b264f29
commit 789855546c
1 changed files with 25 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
scripts/buildsystems/msbuild/vcpkg.targets
View File

@ -1,6 +1,6 @@
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Target Name="RuntimeLibraryAnalyze" BeforeTargets="GetClCommandLines;ClCompile">
<Target Name="VcpkgCompileInputs" BeforeTargets="GetClCommandLines;ClCompile">
<PropertyGroup>
<VcpkgRuntimeLibrary Condition="'%(ClCompile.RuntimeLibrary)' == ''"></VcpkgRuntimeLibrary>
<VcpkgRuntimeLibrary Condition="'%(ClCompile.RuntimeLibrary)' == 'MultiThreadedDebugDLL'"></VcpkgRuntimeLibrary>
@ -44,16 +44,36 @@
<Message Text="Selecting VcpkgTriplet: $(VcpkgTriplet)"/>
<Message Text="Selecting VcpkgRoot: $(VcpkgRoot)"/>
<ItemGroup Condition="'$(VcpkgEnabled)' == 'true'">
<Link>
<AdditionalDependencies Condition="'$(VcpkgConfiguration)' == 'Debug'">$(VcpkgRoot)debug\lib\*.lib;%(Link.AdditionalDependencies)</AdditionalDependencies>
<AdditionalDependencies Condition="'$(VcpkgConfiguration)' == 'Release'">$(VcpkgRoot)lib\*.lib;%(Link.AdditionalDependencies)</AdditionalDependencies>
</Link>
<ClCompile>
<AdditionalIncludeDirectories>$(VcpkgRoot)include;%(ClCompile.AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
</ClCompile>
</ItemGroup>
</Target>
<Target Name="VcpkgLinkInputs"
DependsOnTargets="ComputeRCGeneratedLinkInputs;
ComputeManifestGeneratedLinkerInputs;
ComputeCustomBuildOutput;
ComputeCLGeneratedLinkInputs;
ComputeLinkInputsFromProject;
ComputeReferenceLinkInputs;"
BeforeTargets="Link">
<Message Text="LinkInputs: @(Link)" />
<ItemGroup Condition="'$(VcpkgEnabled)' == 'true'">
<VcpkgLink Include="$(VcpkgRoot)debug\lib\*.lib" Condition="'$(VcpkgConfiguration)' == 'Debug'"/>
<VcpkgLink Include="$(VcpkgRoot)lib\*.lib" Condition="'$(VcpkgConfiguration)' == 'Release'"/>
<Link>
<AdditionalDependencies>@(VcpkgLink);%(Link.AdditionalDependencies)</AdditionalDependencies>
</Link>
</ItemGroup>
<Message Text="VcpkgLinkInputs: @(VcpkgLink)" />
</Target>
<PropertyGroup>
<ComputeLinkInputsTargets >$(ComputeLinkInputsTargets);VcpkgLinkInputs</ComputeLinkInputsTargets >
</PropertyGroup>
<Target Name="AppLocalFromInstalled" AfterTargets="CopyFilesToOutputDirectory" BeforeTargets="CopyLocalFilesOutputGroup" Condition="'$(VcpkgEnabled)' == 'true' and '$(OutputType)' == 'exe'">
<WriteLinesToFile
File="$(TLogLocation)$(ProjectName).write.1u.tlog"