diff options
| author | ras0219 <533828+ras0219@users.noreply.github.com> | 2020-07-08 15:08:17 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-07-08 15:08:17 -0700 |
| commit | fd4a08806fd88299814aac886e57708ade1d7398 (patch) | |
| tree | 8c1a013d8055bc4b80c67dbd63f0a7ba59be71ed /scripts/buildsystems | |
| parent | 82797496cabc0ca34a36cbb70156924c491e6204 (diff) | |
| download | vcpkg-fd4a08806fd88299814aac886e57708ade1d7398.tar.gz vcpkg-fd4a08806fd88299814aac886e57708ade1d7398.zip | |
[vcpkg] Fix MSBuild regressions #12062 and #12086. (#12257)
This PR also renames the VcpkgUserTriplet MSBuild variable to VcpkgTriplet to minimize user confusion compared to previous practice and documentation.
Co-authored-by: Robert Schumacher <roschuma@microsoft.com>
Diffstat (limited to 'scripts/buildsystems')
| -rw-r--r-- | scripts/buildsystems/msbuild/vcpkg-general.xml | 2 | ||||
| -rw-r--r-- | scripts/buildsystems/msbuild/vcpkg.targets | 13 |
2 files changed, 10 insertions, 5 deletions
diff --git a/scripts/buildsystems/msbuild/vcpkg-general.xml b/scripts/buildsystems/msbuild/vcpkg-general.xml index d45f1103f..2638597a6 100644 --- a/scripts/buildsystems/msbuild/vcpkg-general.xml +++ b/scripts/buildsystems/msbuild/vcpkg-general.xml @@ -41,7 +41,7 @@ Category="General"
Default="true">
</BoolProperty>
- <StringProperty Name="VcpkgUserTriplet"
+ <StringProperty Name="VcpkgTriplet"
DisplayName="Triplet"
Description="Specifies the triplet used by Vcpkg"
Category="General"
diff --git a/scripts/buildsystems/msbuild/vcpkg.targets b/scripts/buildsystems/msbuild/vcpkg.targets index d0492262a..e27fd39f9 100644 --- a/scripts/buildsystems/msbuild/vcpkg.targets +++ b/scripts/buildsystems/msbuild/vcpkg.targets @@ -20,9 +20,17 @@ <VcpkgOSTarget Condition="'$(VcpkgOSTarget)' == ''">windows</VcpkgOSTarget> </PropertyGroup> + <!-- Set default Platform Target--> + <PropertyGroup Condition="'$(Platform)' == 'Win32'"> + <VcpkgPlatformTarget Condition="'$(VcpkgPlatformTarget)' == ''">x86</VcpkgPlatformTarget> + </PropertyGroup> + <PropertyGroup> + <VcpkgPlatformTarget Condition="'$(VcpkgPlatformTarget)' == ''">$(Platform)</VcpkgPlatformTarget> + </PropertyGroup> + <!-- Set other defaults--> <PropertyGroup Condition="'$(VcpkgHasProps)'!='true'" > - <VcpkgUserTriplet Condition="'$(VcpkgUserTriplet)' == ''">$(PlatformTarget)-$(VcpkgOSTarget)</VcpkgUserTriplet> + <VcpkgUserTriplet Condition="'$(VcpkgUserTriplet)' == ''">$(VcpkgPlatformTarget)-$(VcpkgOSTarget)</VcpkgUserTriplet> <VcpkgTriplet Condition="'$(VcpkgTriplet)' == ''">$(VcpkgUserTriplet)</VcpkgTriplet> <VcpkgCurrentInstalledDir Condition="'$(VcpkgCurrentInstalledDir)' == ''">$(VcpkgRoot)\installed\$(VcpkgTriplet)\</VcpkgCurrentInstalledDir> </PropertyGroup> @@ -46,9 +54,6 @@ <PropertyGroup Condition="'$(VcpkgUseStatic)' == 'true'"> <VcpkgTriplet>$(VcpkgUserTriplet)-static</VcpkgTriplet> </PropertyGroup> - <PropertyGroup Condition="'$(VcpkgUseStatic)' != 'true'"> - <VcpkgTriplet>$(VcpkgUserTriplet)</VcpkgTriplet> - </PropertyGroup> <PropertyGroup Condition="'$(VcpkgCurrentInstalledDir)' == ''"> <VcpkgCurrentInstalledDir>$(VcpkgInstalledDir)$(VcpkgTriplet)</VcpkgCurrentInstalledDir> |