diff options
| author | Nirbheek Chauhan <nirbheek@centricular.com> | 2016-12-29 21:19:33 +0530 |
|---|---|---|
| committer | Nirbheek Chauhan <nirbheek@centricular.com> | 2017-01-04 00:40:54 +0530 |
| commit | 6b774982feae67d31e22b795bcf918843698072e (patch) | |
| tree | 03768b29f092e455026d14a4fd0641584e2adb02 | |
| parent | 7f3aeb27e7e2e7f5f69234e78ea912830f7141ab (diff) | |
| download | meson-6b774982feae67d31e22b795bcf918843698072e.zip meson-6b774982feae67d31e22b795bcf918843698072e.tar.gz meson-6b774982feae67d31e22b795bcf918843698072e.tar.bz2 | |
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.
| -rw-r--r-- | test cases/common/94 default options/meson.build | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/test cases/common/94 default options/meson.build b/test cases/common/94 default options/meson.build index a718bcc..a9176e0 100644 --- a/test cases/common/94 default options/meson.build +++ b/test cases/common/94 default options/meson.build @@ -1,20 +1,20 @@ project('default options', 'cpp', 'c', default_options : [ 'buildtype=debugoptimized', - 'cpp_std=c++03', + 'cpp_std=c++11', 'cpp_eh=none', '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.') -if cpp.get_id() == 'msvc' +if cpp_id == 'msvc' cpp_eh = get_option('cpp_eh') assert(cpp_eh == 'none', 'MSVC eh value is "' + cpp_eh + '" instead of "none"') else 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 w_level = get_option('warning_level') |