diff options
| author | Robert Schumacher <roschuma@microsoft.com> | 2020-07-08 13:51:03 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-07-08 13:51:03 -0700 |
| commit | eedecc033de8923a0148f7eb576de3bc3411bb54 (patch) | |
| tree | 2e29d1b153da790462dad7495185aab830257304 /scripts | |
| parent | 811cb0cc387d786b30d216d6d5c3a4e6df7491c2 (diff) | |
| download | vcpkg-eedecc033de8923a0148f7eb576de3bc3411bb54.tar.gz vcpkg-eedecc033de8923a0148f7eb576de3bc3411bb54.zip | |
[vcpkg.targets] Fix #12292 regression with MSBuild targets (#12319)
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/buildsystems/msbuild/vcpkg-general.xml | 2 | ||||
| -rw-r--r-- | scripts/buildsystems/msbuild/vcpkg.targets | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/scripts/buildsystems/msbuild/vcpkg-general.xml b/scripts/buildsystems/msbuild/vcpkg-general.xml index 55d5a736b..d45f1103f 100644 --- a/scripts/buildsystems/msbuild/vcpkg-general.xml +++ b/scripts/buildsystems/msbuild/vcpkg-general.xml @@ -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>
diff --git a/scripts/buildsystems/msbuild/vcpkg.targets b/scripts/buildsystems/msbuild/vcpkg.targets index a55dc2cf8..d0492262a 100644 --- a/scripts/buildsystems/msbuild/vcpkg.targets +++ b/scripts/buildsystems/msbuild/vcpkg.targets @@ -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'"> |