diff options
| author | Dylan Baker <dylan@pnwbakers.com> | 2019-01-14 15:23:41 -0800 |
|---|---|---|
| committer | Emil Velikov <emil.l.velikov@gmail.com> | 2019-01-29 17:44:27 +0000 |
| commit | 991f9ea5536102fa2b201eb7d0eeccdc993362a5 (patch) | |
| tree | 3bb9ec68aea273e43e309778bd21713712c133c0 | |
| parent | 84f59f6bbcaf8afabbd9a6fa69982850bf87a116 (diff) | |
meson: Add warnings and errors when using ICC
ICC tries to be helpful by not erroring when it sees something that it
doesn't understand, which is completely the opposite of helpful. Meson
0.49.0 does much better at handling this by really trying to make ICC
error, but there are some things in mesa that still get ignored until
0.49.1
v2: - Fix id check, which is 'intel' not 'icc'
Cc: 18.3 <mesa-stable@lists.freedesktop.org>
Reviewed-by: Eric Engestrom <eric.engestrom@intel.com> (v1)
(cherry picked from commit c1efa240c91e78385e8e433af134289b006016d0)
| -rw-r--r-- | meson.build | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/meson.build b/meson.build index 8af1af09089..82378419a18 100644 --- a/meson.build +++ b/meson.build @@ -1,4 +1,4 @@ -# Copyright © 2017-2018 Intel Corporation +# Copyright © 2017-2019 Intel Corporation # Permission is hereby granted, free of charge, to any person obtaining a copy # of this software and associated documentation files (the "Software"), to deal @@ -165,6 +165,14 @@ with_gallium_svga = _drivers.contains('svga') with_gallium_virgl = _drivers.contains('virgl') with_gallium_swr = _drivers.contains('swr') +if cc.get_id() == 'intel' + if meson.version().verson_compare('< 0.49.0') + error('Meson does not have sufficient support of ICC before 0.49.0 to compile mesa') + elif with_gallium_swr and meson.version().verson_compare('== 0.49.0') + warning('Meson as of 0.49.0 is sufficient for compiling mesa with ICC, but there are some caveats with SWR. 0.49.1 should resolve all of these') + endif +endif + with_gallium = _drivers.length() != 0 and _drivers != [''] if with_gallium and system_has_kms_drm |