diff options
| author | Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> | 2018-11-09 08:48:09 +0100 |
|---|---|---|
| committer | Robert Schumacher <roschuma@microsoft.com> | 2018-11-08 23:48:09 -0800 |
| commit | 4f7d4dc66f242a2b86ce38673c7dd9c32110257f (patch) | |
| tree | aebf414445136de70beeb31853c0bfbc0da534de /scripts | |
| parent | eac46c297e5d4640e50db440f1aaab9372a0c86c (diff) | |
| download | vcpkg-4f7d4dc66f242a2b86ce38673c7dd9c32110257f.tar.gz vcpkg-4f7d4dc66f242a2b86ce38673c7dd9c32110257f.zip | |
Temp fix for #4359 (#4573)
* make user wide integration not burn everything if LLVM is used as a toolset.
(e.g. cmake -G "VS" -TLLVM fails to even find compiler due to linker issues)
fixes #4359 but might have side effects for that toolset.
(e.g. not automatically adding dependencies)
* remove whitespaces
* [vcpkg-integrate] Conform to MSBuild conventions for comparisons
Diffstat (limited to 'scripts')
| -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'"> |