diff options
| author | Dylan Baker <dylan@pnwbakers.com> | 2019-05-03 11:31:37 -0700 |
|---|---|---|
| committer | Dylan Baker <dylan@pnwbakers.com> | 2019-05-10 13:36:35 -0700 |
| commit | 28aac9fc3b6129e4c0cac9f5fc2ba4eab97f77b8 (patch) | |
| tree | 1d44e32a5d866142dc3bed8870dc4891d59d63f4 | |
| parent | c2ee82cc418d896935d4a96651ba9fa49a53b636 (diff) | |
| download | meson-28aac9fc3b6129e4c0cac9f5fc2ba4eab97f77b8.zip meson-28aac9fc3b6129e4c0cac9f5fc2ba4eab97f77b8.tar.gz meson-28aac9fc3b6129e4c0cac9f5fc2ba4eab97f77b8.tar.bz2 | |
test cases: Add ICL branches in addition to ICC branches
| -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') |