3party/vcpkg
0
0
Fork 0
mirror of https://github.com/microsoft/vcpkg.git synced 2024-12-27 18:31:15 +08:00
Code Issues Projects Releases Wiki Activity

[vcpkg.targets] Fix #12292 regression with MSBuild targets (#12319)

Browse Source
This commit is contained in:
Robert Schumacher 2020-07-08 13:51:03 -07:00 committed by GitHub
parent 811cb0cc38
commit eedecc033d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
scripts/buildsystems/msbuild/vcpkg-general.xml
View File

@ -37,7 +37,7 @@
</BoolProperty>
<BoolProperty Name="VcpkgAutoLink"
DisplayName="Use AutoLink"
Description="Enables automatic linking with libraries build using Vcpkg"
Description="Enables automatic linking with libraries build using Vcpkg. Does not work with lld-link.exe."
Category="General"
Default="true">
</BoolProperty>

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

@ -64,7 +64,7 @@
<VcpkgApplocalDeps Condition="'$(VcpkgApplocalDeps)' == ''">true</VcpkgApplocalDeps>
<!-- Deactivate Autolinking if lld is used as a linker. (Until a better way to solve the problem is found!).
Tried to add /lib as a parameter to the linker call but was unable to find a way to pass it as the first parameter. -->
<VcpkgAutoLink Condition="'$(UseLldLink)' == 'true' and '$(VcpkgAutoLink)' == ''">false</VcpkgAutoLink>
<VcpkgAutoLink Condition="'$(UseLldLink)' == 'true'">false</VcpkgAutoLink>
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(VcpkgEnabled)' == 'true'">