diff options
| author | Stephane Lajoie <dada@typicus.org> | 2020-07-01 15:18:13 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-07-01 12:18:13 -0700 |
| commit | 428df4c7d6c0718170fadb1d07edbfd996ec1103 (patch) | |
| tree | 690c81b5196bc7b02fdeff130d8f30ee8062debd /scripts | |
| parent | 7e8cda8404241b06a3af150f5bf66672dc816172 (diff) | |
| download | vcpkg-428df4c7d6c0718170fadb1d07edbfd996ec1103.tar.gz vcpkg-428df4c7d6c0718170fadb1d07edbfd996ec1103.zip | |
Don't change manifest root when manifest isn't enabled. (#12191)
* Don't change manifest root when manifest isn't enabled.
* Update scripts/buildsystems/msbuild/vcpkg.targets
* Apply suggestions from code review
Co-authored-by: nicole mazzuca <mazzucan@outlook.com>
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/buildsystems/msbuild/vcpkg.targets | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/scripts/buildsystems/msbuild/vcpkg.targets b/scripts/buildsystems/msbuild/vcpkg.targets index 0f562a876..f93e51056 100644 --- a/scripts/buildsystems/msbuild/vcpkg.targets +++ b/scripts/buildsystems/msbuild/vcpkg.targets @@ -59,7 +59,7 @@ <VcpkgNormalizedConfiguration Condition="$(VcpkgConfiguration.StartsWith('Release')) or '$(VcpkgConfiguration)' == 'RelWithDebInfo' or '$(VcpkgConfiguration)' == 'MinSizeRel'">Release</VcpkgNormalizedConfiguration> <VcpkgRoot Condition="!$(VcpkgRoot.EndsWith('\'))">$(VcpkgRoot)\</VcpkgRoot> <VcpkgCurrentInstalledDir Condition="!$(VcpkgCurrentInstalledDir.EndsWith('\'))">$(VcpkgCurrentInstalledDir)\</VcpkgCurrentInstalledDir> - <VcpkgManifestRoot Condition="!$(VcpkgManifestRoot.EndsWith('\'))">$(VcpkgManifestRoot)\</VcpkgManifestRoot> + <VcpkgManifestRoot Condition="'$(VcpkgManifestRoot)' != '' and !$(VcpkgManifestRoot.EndsWith('\'))">$(VcpkgManifestRoot)\</VcpkgManifestRoot> <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. --> |