diff options
| author | Nirbheek Chauhan <nirbheek@centricular.com> | 2018-05-05 16:50:27 +0530 |
|---|---|---|
| committer | Nirbheek Chauhan <nirbheek@centricular.com> | 2018-05-05 16:50:27 +0530 |
| commit | a282b49dd91031ed4219ef98d73fedf06c720f74 (patch) | |
| tree | f9b5118b02df867e21ccc658061167e0e571edf5 | |
| parent | 2e0485bb9bc4f36783436b8a2e1689659ecaf52c (diff) | |
| download | meson-nirbheek/fix-mkenums-simple-includes.tar.gz | |
gnome: Use the header basename for #include in mkenums_simplenirbheek/fix-mkenums-simple-includes
Otherwise, when you use a File target, the value will be the full path
to the header from the build root, which is not what anyone wants.
| -rw-r--r-- | mesonbuild/modules/gnome.py | 2 | ||||
| -rw-r--r-- | test cases/frameworks/7 gnome/mkenums/meson.build | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/mesonbuild/modules/gnome.py b/mesonbuild/modules/gnome.py index 9d87dadf6..6f9cef24c 100644 --- a/mesonbuild/modules/gnome.py +++ b/mesonbuild/modules/gnome.py @@ -1129,7 +1129,7 @@ This will become a hard error in the future.''') fhead += '%s\n' % body_prefix fhead += '#include "%s"\n' % hdr_filename for hdr in sources: - fhead += '#include "%s"\n' % hdr + fhead += '#include "%s"\n' % os.path.basename(str(hdr)) fhead += ''' #define C_ENUM(v) ((gint) v) #define C_FLAGS(v) ((guint) v) diff --git a/test cases/frameworks/7 gnome/mkenums/meson.build b/test cases/frameworks/7 gnome/mkenums/meson.build index 44c21cba4..ff3161991 100644 --- a/test cases/frameworks/7 gnome/mkenums/meson.build +++ b/test cases/frameworks/7 gnome/mkenums/meson.build @@ -118,7 +118,7 @@ enumexe3 = executable('enumprog3', main, enums_c3, enums_h3, dependencies : gobj) test('enum test 3', enumexe3) -enums4 = gnome.mkenums_simple('enums4', sources : 'meson-sample.h', +enums4 = gnome.mkenums_simple('enums4', sources : files('meson-sample.h'), function_prefix : '_') enumexe4 = executable('enumprog4', 'main4.c', enums4, dependencies : gobj) |