diff options
| author | eao197 <eao197@gmail.com> | 2018-11-12 16:19:10 +0300 |
|---|---|---|
| committer | eao197 <eao197@gmail.com> | 2018-11-12 16:19:10 +0300 |
| commit | 2d0ce681b068da0b05c3a4a99573dd00a9415eba (patch) | |
| tree | 85f9572b8edaa611199d6e281af278e56d0094bf /scripts/buildsystems | |
| parent | 8c13a782a044edc67f655b5dcb0227e737136e74 (diff) | |
| parent | 8dc8d0e0c97550a95b764287adbad90b7df7d11d (diff) | |
| download | vcpkg-2d0ce681b068da0b05c3a4a99573dd00a9415eba.tar.gz vcpkg-2d0ce681b068da0b05c3a4a99573dd00a9415eba.zip | |
Merge https://github.com/Microsoft/vcpkg
Diffstat (limited to 'scripts/buildsystems')
| -rw-r--r-- | scripts/buildsystems/msbuild/vcpkg.targets | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/scripts/buildsystems/msbuild/vcpkg.targets b/scripts/buildsystems/msbuild/vcpkg.targets index 456783f4d..8807befd8 100644 --- a/scripts/buildsystems/msbuild/vcpkg.targets +++ b/scripts/buildsystems/msbuild/vcpkg.targets @@ -55,6 +55,9 @@ <VcpkgNormalizedConfiguration Condition="$(VcpkgConfiguration.StartsWith('Release')) or '$(VcpkgConfiguration)' == 'RelWithDebInfo' or '$(VcpkgConfiguration)' == 'MinSizeRel'">Release</VcpkgNormalizedConfiguration> <VcpkgRoot Condition="'$(VcpkgRoot)' == ''">$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), .vcpkg-root))\installed\$(VcpkgTriplet)\</VcpkgRoot> <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> </PropertyGroup> <ItemDefinitionGroup Condition="'$(VcpkgEnabled)' == 'true'"> |