diff options
| author | Richard Hughes <richard@hughsie.com> | 2019-02-07 13:50:51 +0000 |
|---|---|---|
| committer | Richard Hughes <richard@hughsie.com> | 2019-03-08 12:03:51 +0000 |
| commit | 7a05855db13593eaa428f245fb2a28b580982d81 (patch) | |
| tree | 97e63ac44f19e8c655e4a5cf74e5b34d40867b28 | |
| parent | ce851fbb0e3f6a46f432904fd5673339206dd6bb (diff) | |
| download | gnome-color-manager-7a05855db13593eaa428f245fb2a28b580982d81.tar.gz | |
Use newer meson features to fix a build warning
| -rw-r--r-- | meson.build | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/meson.build b/meson.build index 4ed149c..acd0a08 100644 --- a/meson.build +++ b/meson.build @@ -2,7 +2,7 @@ project('gnome-color-manager', 'c', 'cpp', version : '3.30.1', license : 'GPL-2.0+', default_options : ['warning_level=1'], - meson_version : '>=0.37.0' + meson_version : '>=0.46.0' ) conf = configuration_data() @@ -65,20 +65,15 @@ endforeach # enable full RELRO where possible # FIXME: until https://github.com/mesonbuild/meson/issues/1140 is fixed -global_link_args = [] test_link_args = [ '-Wl,-z,relro', '-Wl,-z,now', ] foreach arg: test_link_args - if cc.has_argument(arg) - global_link_args += arg + if cc.has_link_argument(arg) + add_project_link_arguments(arg, language : 'c') endif endforeach -add_global_link_arguments( - global_link_args, - language: 'c' -) prefixed_bindir = join_paths(get_option('prefix'), get_option('bindir')) prefixed_localedir = join_paths(get_option('prefix'), get_option('localedir')) |