Skip to content

Commit aef7ad2

Browse files
eggrobinmarkusicu
authored andcommitted
ICU-23054 Make the MSVC stdcpplatest build work as intended
1 parent 846a834 commit aef7ad2

File tree

3 files changed

+7
-5
lines changed

3 files changed

+7
-5
lines changed

.github/workflows/icu4c.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -376,10 +376,10 @@ jobs:
376376
build_flags: '/p:Configuration=Debug /p:Platform=Win32'
377377
- test_flags: 'arm Release'
378378
build_flags: '/p:Configuration=Release /p:Platform=ARM'
379+
- test_flags: 'x64 Release cpplatest'
380+
build_flags: '/p:OverrideLanguageStandard=stdcpplatest /p:Configuration=Release /p:Platform=x64'
379381
- test_flags: 'x64 Release'
380-
build_flags: '/p:LanguageStandard=stdcpplatest /p:Configuration=Release /p:Platform=x64'
381-
- test_flags: 'x64 Release'
382-
build_flags: '/p:_HAS_EXCEPTIONS=0 /p:Configuration=Release /p:Platform=x64'
382+
build_flags: '/p:Configuration=Release /p:Platform=x64'
383383
steps:
384384
- uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
385385
- name: Set up MSBuild

icu4c/source/allinone/Build.Windows.ProjectConfiguration.props

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,8 @@
9797
<!-- Enable parallel compilation for faster builds. -->
9898
<MultiProcessorCompilation>true</MultiProcessorCompilation>
9999
<!-- Set the C/C++ versions supported. -->
100-
<LanguageStandard>stdcpp17</LanguageStandard>
100+
<LanguageStandard Condition="'$(OverrideLanguageStandard)'==''">stdcpp17</LanguageStandard>
101+
<LanguageStandard Condition="'$(OverrideLanguageStandard)'!=''">$(OverrideLanguageStandard)</LanguageStandard>
101102
<LanguageStandard_C>stdc11</LanguageStandard_C>
102103
</ClCompile>
103104
<ResourceCompile>

icu4c/source/allinone/Build.Windows.UWP.ProjectConfiguration.props

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,8 @@
4646
U_PLATFORM_HAS_WINUWP_API=1;
4747
</PreprocessorDefinitions>
4848
<!-- Set the C/C++ versions supported. -->
49-
<LanguageStandard>stdcpp17</LanguageStandard>
49+
<LanguageStandard Condition="'$(OverrideLanguageStandard)'==''">stdcpp17</LanguageStandard>
50+
<LanguageStandard Condition="'$(OverrideLanguageStandard)'!=''">$(OverrideLanguageStandard)</LanguageStandard>
5051
<LanguageStandard_C>stdc11</LanguageStandard_C>
5152
</ClCompile>
5253
<ResourceCompile>

0 commit comments

Comments
 (0)