diff options
| author | zhouqi <zhouqi.whu@hotmail.com> | 2018-12-05 16:59:08 +0800 |
|---|---|---|
| committer | zhouqi <zhouqi.whu@hotmail.com> | 2018-12-05 16:59:08 +0800 |
| commit | 2b410bea32837c8a498c3ce6ae88b82013fe2e52 (patch) | |
| tree | a7cf9d04d503658f30149a1d291aefaef2f65c87 /scripts/buildsystems | |
| parent | 642e37b3c9f14d5f822239b630933d8eed7e8b70 (diff) | |
| parent | 5f63d0a5f77b4179df6dc10110637775a1d0fe69 (diff) | |
| download | vcpkg-2b410bea32837c8a498c3ce6ae88b82013fe2e52.tar.gz vcpkg-2b410bea32837c8a498c3ce6ae88b82013fe2e52.zip | |
Merge branch 'master' of https://github.com/zhouqime/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'"> |