diff options
| author | Phoebe <20694052+PhoebeHui@users.noreply.github.com> | 2020-12-01 01:39:23 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-11-30 09:39:23 -0800 |
| commit | 480ec85d5189f4b483de325f96c8d8ccdbcb1153 (patch) | |
| tree | ccc5378ba26e00a2f67333f70a392d4bbdb27041 /scripts | |
| parent | 43e41bb2b0d0ce8ac1ff92af79e401cdf96f6caa (diff) | |
| download | vcpkg-480ec85d5189f4b483de325f96c8d8ccdbcb1153.tar.gz vcpkg-480ec85d5189f4b483de325f96c8d8ccdbcb1153.zip | |
[vcpkg] Fix issue in vcpkg.targets that introduced in 13755 (#14797)
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/buildsystems/msbuild/vcpkg.targets | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/scripts/buildsystems/msbuild/vcpkg.targets b/scripts/buildsystems/msbuild/vcpkg.targets index 3c0791aab..0ba7d8918 100644 --- a/scripts/buildsystems/msbuild/vcpkg.targets +++ b/scripts/buildsystems/msbuild/vcpkg.targets @@ -4,15 +4,17 @@ <Import Condition="'$(VcpkgPropsImported)' != 'true'" Project="vcpkg.props" /> <!-- Define properties derived from those defined in vcpkg.props, in the project file or specified on the command line. --> + <PropertyGroup> + <!-- Note: Overwrite VcpkgPageSchema with a non-existing path to disable the VcPkg property sheet in your projects --> + <VcpkgPageSchema Condition="'$(VcpkgPageSchema)' == ''">$([System.IO.Path]::Combine($(VcpkgRoot), 'scripts\buildsystems\msbuild\vcpkg-general.xml'))</VcpkgPageSchema> + </PropertyGroup> + <PropertyGroup Condition="'$(VcpkgEnabled)' == 'true'"> <!-- Triplet defining platform, OS, and linkage --> <VcpkgLinkage /> <VcpkgLinkage Condition="'$(VcpkgUseStatic)' == 'true'">-static</VcpkgLinkage> <VcpkgTriplet Condition="'$(VcpkgTriplet)' == ''">$(VcpkgPlatformTarget)-$(VcpkgOSTarget)$(VcpkgLinkage)</VcpkgTriplet> - <!-- Note: Overwrite VcpkgPageSchema with a non-existing path to disable the VcPkg property sheet in your projects --> - <VcpkgPageSchema Condition="'$(VcpkgPageSchema)' == ''">$([System.IO.Path]::Combine($(VcpkgRoot), 'scripts\buildsystems\msbuild\vcpkg-general.xml'))</VcpkgPageSchema> - <VcpkgRoot Condition="'$(VcpkgRoot)' != '' and !$(VcpkgRoot.EndsWith('\'))">$(VcpkgRoot)\</VcpkgRoot> <VcpkgManifestRoot Condition="'$(VcpkgManifestRoot)' != '' and !$(VcpkgManifestRoot.EndsWith('\'))">$(VcpkgManifestRoot)\</VcpkgManifestRoot> |