diff options
Diffstat (limited to 'scripts/buildsystems/msbuild/vcpkg.targets')
| -rw-r--r-- | scripts/buildsystems/msbuild/vcpkg.targets | 13 |
1 files changed, 9 insertions, 4 deletions
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> |