diff options
| -rw-r--r-- | test cases/common/1 trivial/meson.build | 5 | ||||
| -rw-r--r-- | test cases/common/2 cpp/meson.build | 5 |
2 files changed, 8 insertions, 2 deletions
diff --git a/test cases/common/1 trivial/meson.build b/test cases/common/1 trivial/meson.build index 67d6ed6..c71d9b0 100644 --- a/test cases/common/1 trivial/meson.build +++ b/test cases/common/1 trivial/meson.build @@ -6,9 +6,12 @@ project('trivial test', #this is a comment sources = 'trivial.c' -if meson.get_compiler('c').get_id() == 'intel' +cc = meson.get_compiler('c') +if cc.get_id() == 'intel' # Error out if the -std=xxx option is incorrect add_project_arguments('-diag-error', '10159', language : 'c') +elif cc.get_id() == 'intel-cl' + add_project_arguments('/Qdiag-error:10159', language : 'c') endif if meson.is_cross_build() diff --git a/test cases/common/2 cpp/meson.build b/test cases/common/2 cpp/meson.build index 6398382..27c4321 100644 --- a/test cases/common/2 cpp/meson.build +++ b/test cases/common/2 cpp/meson.build @@ -1,8 +1,11 @@ project('c++ test', 'cpp') -if meson.get_compiler('cpp').get_id() == 'intel' +cpp = meson.get_compiler('cpp') +if cpp.get_id() == 'intel' # Error out if the -std=xxx option is incorrect add_project_arguments('-diag-error', '10159', language : 'cpp') +elif cpp.get_id() == 'intel-cl' + add_project_arguments('/Qdiag-error:10159', language : 'cpp') endif exe = executable('trivialprog', 'trivial.cc', extra_files : 'something.txt') |