Skip to content

Commit defa0e1

Browse files
committed
obviously MSVC has its own setting
1 parent 5afc2fe commit defa0e1

1 file changed

Lines changed: 6 additions & 5 deletions

File tree

src/avcpp/meson.build

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -36,16 +36,17 @@ av_libs = [
3636
]
3737

3838
conf_data = configuration_data()
39-
if get_option('cpp_std') == 'c++17' or get_option('cpp_std') == 'gnu++17'
39+
cpp_std = get_option('cpp_std')
40+
if cpp_std in ['c++17', 'gnu++17', 'vc++17']
4041
conf_data.set('AVCPP_CXX_STANDARD', '17')
41-
elif get_option('cpp_std') == 'c++20' or get_option('cpp_std') == 'gnu++20'
42+
elif cpp_std in ['c++20', 'gnu++20', 'vc++20']
4243
conf_data.set('AVCPP_CXX_STANDARD', '20')
43-
elif get_option('cpp_std') == 'c++23' or get_option('cpp_std') == 'gnu++23'
44+
elif cpp_std in ['c++23', 'gnu++23', 'vc++23']
4445
conf_data.set('AVCPP_CXX_STANDARD', '23')
45-
elif get_option('cpp_std') == 'c++26' or get_option('cpp_std') == 'gnu++26'
46+
elif cpp_std in ['c++26', 'gnu++26', 'vc++26']
4647
conf_data.set('AVCPP_CXX_STANDARD', '26')
4748
else
48-
warning('C++ standard setting ', get_option('cpp_std'), ' not recognized')
49+
warning('C++ standard setting ', cpp_std, ' not recognized')
4950
endif
5051

5152
foreach lib : av_libs

0 commit comments

Comments
 (0)