tests/common/94: Set the default C++ std to C++11

The Intel compiler does not support C++03, but does support C++11, so
use that as the lowest-common-denominator for our tests.
pull/1253/head
Nirbheek Chauhan 8 years ago
parent 7f3aeb27e7
commit 6b774982fe
  1. 8
      test cases/common/94 default options/meson.build

@ -1,20 +1,20 @@
project('default options', 'cpp', 'c', default_options : [ project('default options', 'cpp', 'c', default_options : [
'buildtype=debugoptimized', 'buildtype=debugoptimized',
'cpp_std=c++03', 'cpp_std=c++11',
'cpp_eh=none', 'cpp_eh=none',
'warning_level=3', 'warning_level=3',
]) ])
cpp = meson.get_compiler('cpp') cpp_id = meson.get_compiler('cpp').get_id()
assert(get_option('buildtype') == 'debugoptimized', 'Build type default value wrong.') assert(get_option('buildtype') == 'debugoptimized', 'Build type default value wrong.')
if cpp.get_id() == 'msvc' if cpp_id == 'msvc'
cpp_eh = get_option('cpp_eh') cpp_eh = get_option('cpp_eh')
assert(cpp_eh == 'none', 'MSVC eh value is "' + cpp_eh + '" instead of "none"') assert(cpp_eh == 'none', 'MSVC eh value is "' + cpp_eh + '" instead of "none"')
else else
cpp_std = get_option('cpp_std') cpp_std = get_option('cpp_std')
assert(cpp_std == 'c++03', 'C++ std value is "' + cpp_std + '" instead of c++03.') assert(cpp_std == 'c++11', 'C++ std value is "' + cpp_std + '" instead of c++11.')
endif endif
w_level = get_option('warning_level') w_level = get_option('warning_level')

Loading…
Cancel
Save