summaryrefslogtreecommitdiff
path: root/Build/source/libs/icu/icu-src/source/allinone
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2021-02-13 17:46:14 +0000
committerKarl Berry <karl@freefriends.org>2021-02-13 17:46:14 +0000
commite10da232612cffe84bd4104d6e49a4b3eb5408f1 (patch)
tree2557cc3a01b6cfadfa75efc0e213062ec648990c /Build/source/libs/icu/icu-src/source/allinone
parent29a53021f09a33510bfc86395b70476368e85b7f (diff)
icu-68.2
git-svn-id: svn://tug.org/texlive/trunk@57727 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/libs/icu/icu-src/source/allinone')
-rw-r--r--Build/source/libs/icu/icu-src/source/allinone/Build.Windows.PlatformToolset.props47
-rw-r--r--Build/source/libs/icu/icu-src/source/allinone/Build.Windows.ProjectConfiguration.props8
-rw-r--r--Build/source/libs/icu/icu-src/source/allinone/Build.Windows.UWP.ProjectConfiguration.props14
3 files changed, 43 insertions, 26 deletions
diff --git a/Build/source/libs/icu/icu-src/source/allinone/Build.Windows.PlatformToolset.props b/Build/source/libs/icu/icu-src/source/allinone/Build.Windows.PlatformToolset.props
index b4777679b80..adee8f67191 100644
--- a/Build/source/libs/icu/icu-src/source/allinone/Build.Windows.PlatformToolset.props
+++ b/Build/source/libs/icu/icu-src/source/allinone/Build.Windows.PlatformToolset.props
@@ -1,16 +1,22 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- Copyright (C) 2016 and later: Unicode, Inc. and others. License & terms of use: http://www.unicode.org/copyright.html -->
<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
- <!-- This file is used to set the PlatformToolset configuration option for all UWP projects. -->
-
+ <!-- This file is used to set configuration option for all projects. -->
+
<!-- Automatic PlatformToolset version selection. -->
- <!-- If there is no DefaultPlatformToolset set, we will detect the version based on version of the build tools. -->
+ <!-- If there is no DefaultPlatformToolset set, we will try to detect the version based on version of the build tools. -->
<PropertyGroup>
<BuildToolVersion>$(VisualStudioVersion)</BuildToolVersion>
- <BuildToolVersion Condition="'$(BuildToolVersion)'==''">$(MSBuildToolsVersion)</BuildToolVersion>
- <!-- Note: v140 is the Visual Studio 2015 toolset. v141 is the Visual Studio 2017 toolset. -->
+ <!-- Only use the MSBuildToolsVersion if we don't have the VisualStudioVersion and MSBuildToolsVersion is set to something other than Current. -->
+ <BuildToolVersion Condition="'$(BuildToolVersion)'=='' and '$(MSBuildToolsVersion)' != 'Current'">$(MSBuildToolsVersion)</BuildToolVersion>
+ <!-- Note:
+ v140 is the Visual Studio 2015 toolset. (14.0)
+ v141 is the Visual Studio 2017 toolset. (15.0)
+ v142 is the Visual Studio 2019 toolset. (16.0)
+ -->
<AutoDetectedPlatformToolset Condition="'$(BuildToolVersion)'=='14.0'">v140</AutoDetectedPlatformToolset>
<AutoDetectedPlatformToolset Condition="'$(BuildToolVersion)'=='15.0'">v141</AutoDetectedPlatformToolset>
+ <AutoDetectedPlatformToolset Condition="'$(BuildToolVersion)'=='16.0'">v142</AutoDetectedPlatformToolset>
</PropertyGroup>
<PropertyGroup Label="EmptyDefaultPlatformToolset">
<DefaultPlatformToolset Condition=" '$(DefaultPlatformToolset)' == '' ">$(AutoDetectedPlatformToolset)</DefaultPlatformToolset>
@@ -18,9 +24,36 @@
<PropertyGroup Label="PlatformToolset">
<PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
</PropertyGroup>
+
+ <!-- This is the default SDK target. -->
+ <!--
+ If not already set, use the latest installed version of the Windows 10 SDK.
+ The Windows 10 SDK is backwards compatible to Windows 7, as long as WINVER and _WIN32_WINNT are set before compiling.
+ Note:
+ - With VS2019, using a value of "10.0" means that it will use the latest installed version.
+ - With VS2017, we need to manually detect the latest SDK version from the registry.
+ - With VS2015, use the Windows 8.1 SDK.
+ -->
+ <PropertyGroup Condition="'$(WindowsTargetPlatformVersion)'=='' and '$(PlatformToolset)'=='v142'">
+ <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(WindowsTargetPlatformVersion)'=='' and ('$(PlatformToolset)'=='v141' or '$(AutodetectWin10SDK)'=='true')">
+ <!-- Detect the SDK version. -->
+ <WindowsSdkInstallFolder_10 Condition="'$(WindowsSdkInstallFolder_10)' == ''">$(Registry:HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Microsoft SDKs\Windows\v10.0@InstallationFolder)</WindowsSdkInstallFolder_10>
+ <WindowsSdkInstallFolder_10 Condition="'$(WindowsSdkInstallFolder_10)' == ''">$(Registry:HKEY_LOCAL_MACHINE\SOFTWARE\Wow6432Node\Microsoft\Microsoft SDKs\Windows\v10.0@InstallationFolder)</WindowsSdkInstallFolder_10>
+ <WindowsTargetPlatformVersion_10 Condition="'$(WindowsTargetPlatformVersion_10)' == ''">$(Registry:HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Microsoft SDKs\Windows\v10.0@ProductVersion)</WindowsTargetPlatformVersion_10>
+ <WindowsTargetPlatformVersion_10 Condition="'$(WindowsTargetPlatformVersion_10)' == ''">$(Registry:HKEY_LOCAL_MACHINE\SOFTWARE\Wow6432Node\Microsoft\Microsoft SDKs\Windows\v10.0@ProductVersion)</WindowsTargetPlatformVersion_10>
+ <!-- Sometimes the version in the registry has the '.0' suffix, and sometimes it doesn't. Check and add it. -->
+ <WindowsTargetPlatformVersion_10 Condition="'$(WindowsTargetPlatformVersion_10)' != '' and !$(WindowsTargetPlatformVersion_10.EndsWith('.0'))">$(WindowsTargetPlatformVersion_10).0</WindowsTargetPlatformVersion_10>
+ <!-- Set the default. -->
+ <WindowsTargetPlatformVersion>$(WindowsTargetPlatformVersion_10)</WindowsTargetPlatformVersion>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(WindowsTargetPlatformVersion)'=='' and '$(PlatformToolset)'=='v140'">
+ <WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion>
+ </PropertyGroup>
+ <!-- Disable MSBuild warning about Linker OutputFile. -->
<PropertyGroup>
- <!-- Disable MSBuild warning about Linker OutputFile. -->
- <!-- Ex: MSBuild complains that the common project creates "icuuc62.dll" rather than "common.dll". However, this is intentional. -->
+ <!-- For example: MSBuild complains that the common project creates "icuuc62.dll" rather than "common.dll". However, this is intentional. -->
<MSBuildWarningsAsMessages>MSB8012</MSBuildWarningsAsMessages>
</PropertyGroup>
</Project>
diff --git a/Build/source/libs/icu/icu-src/source/allinone/Build.Windows.ProjectConfiguration.props b/Build/source/libs/icu/icu-src/source/allinone/Build.Windows.ProjectConfiguration.props
index ab535881c79..147689b910a 100644
--- a/Build/source/libs/icu/icu-src/source/allinone/Build.Windows.ProjectConfiguration.props
+++ b/Build/source/libs/icu/icu-src/source/allinone/Build.Windows.ProjectConfiguration.props
@@ -56,13 +56,7 @@
<IcuBinOutputDir>binARM64</IcuBinOutputDir>
<IcuLibOutputDir>libARM64</IcuLibOutputDir>
</PropertyGroup>
- <!-- This is the default SDK target. -->
- <PropertyGroup>
- <!-- Note that the Windows 8.1 SDK is backwards compatible down-level to Windows 7, so
- setting this to 8.1 does not actually imply targeting Windows 8.1. -->
- <WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion>
- </PropertyGroup>
- <!-- Desktop ARM/ARM64 support requires a newer version of the Windows SDK than 8.1 -->
+ <!-- Desktop ARM/ARM64 support requires a different version of the Windows SDK -->
<!--
Note: This version must match the version below in the ARM64 section for AdditionalLibraryDirectories
-->
diff --git a/Build/source/libs/icu/icu-src/source/allinone/Build.Windows.UWP.ProjectConfiguration.props b/Build/source/libs/icu/icu-src/source/allinone/Build.Windows.UWP.ProjectConfiguration.props
index 359d2c2de43..89d528a7791 100644
--- a/Build/source/libs/icu/icu-src/source/allinone/Build.Windows.UWP.ProjectConfiguration.props
+++ b/Build/source/libs/icu/icu-src/source/allinone/Build.Windows.UWP.ProjectConfiguration.props
@@ -8,18 +8,8 @@
<ApplicationType>Windows Store</ApplicationType>
<ApplicationTypeRevision>10.0</ApplicationTypeRevision>
</PropertyGroup>
- <!-- If not already set, then we will default to using the latest installed Windows 10 SDK version. -->
- <PropertyGroup Condition="'$(WindowsTargetPlatformVersion)'==''">
- <!-- Detect the SDK version. -->
- <WindowsSdkInstallFolder_10 Condition="'$(WindowsSdkInstallFolder_10)' == ''">$(Registry:HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Microsoft SDKs\Windows\v10.0@InstallationFolder)</WindowsSdkInstallFolder_10>
- <WindowsSdkInstallFolder_10 Condition="'$(WindowsSdkInstallFolder_10)' == ''">$(Registry:HKEY_LOCAL_MACHINE\SOFTWARE\Wow6432Node\Microsoft\Microsoft SDKs\Windows\v10.0@InstallationFolder)</WindowsSdkInstallFolder_10>
- <WindowsTargetPlatformVersion_10 Condition="'$(WindowsTargetPlatformVersion_10)' == ''">$(Registry:HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Microsoft SDKs\Windows\v10.0@ProductVersion)</WindowsTargetPlatformVersion_10>
- <WindowsTargetPlatformVersion_10 Condition="'$(WindowsTargetPlatformVersion_10)' == ''">$(Registry:HKEY_LOCAL_MACHINE\SOFTWARE\Wow6432Node\Microsoft\Microsoft SDKs\Windows\v10.0@ProductVersion)</WindowsTargetPlatformVersion_10>
- <!-- Sometimes the version in the registry has the '.0' suffix, and sometimes it doesn't. Check and add it. -->
- <WindowsTargetPlatformVersion_10 Condition="'$(WindowsTargetPlatformVersion_10)' != '' and !$(WindowsTargetPlatformVersion_10.EndsWith('.0'))">$(WindowsTargetPlatformVersion_10).0</WindowsTargetPlatformVersion_10>
- <!-- Set the default. -->
- <WindowsTargetPlatformVersion>$(WindowsTargetPlatformVersion_10)</WindowsTargetPlatformVersion>
- <!-- Set the minimum Win10 SDK version to TH1/RTM. -->
+ <PropertyGroup>
+ <!-- Set the minimum Windows 10 SDK version to TH1/RTM. -->
<WindowsTargetPlatformMinVersion>10.0.10240.0</WindowsTargetPlatformMinVersion>
</PropertyGroup>
<!-- The following import will set the PlatformToolset configuration. -->