isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2025-06-14 01:09:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

build: Don't use absolute paths with subdir keyword

Browse Source 
Meson 0.50.0 made passing an absolute path to install_headers()'
subdir keyword a fatal error. This means we have to track both
relative (to includedir) paths for header subdirs and absolute
paths for generated headers now :-(

https://gitlab.gnome.org/GNOME/mutter/merge_requests/492
This commit is contained in:
Florian Müllner
2019-03-12 01:35:13 +01:00
committed by Jonas Ådahl
parent 00b4556051
commit a1e325f749
9 changed files with 22 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
clutter/clutter/meson.build
View File

@ -1,3 +1,4 @@
clutter_clutter_includesubdir = join_paths(clutter_includesubdir, 'clutter')
clutter_clutter_includedir = join_paths(clutter_includedir, 'clutter')
clutter_headers = [
@ -577,16 +578,16 @@ if have_introspection
endif
install_headers(clutter_headers,
subdir: clutter_clutter_includedir)
subdir: clutter_clutter_includesubdir)
install_headers(cally_headers,
subdir: join_paths(clutter_includedir, 'cally'))
subdir: join_paths(clutter_includesubdir, 'cally'))
install_headers(clutter_deprecated_headers,
subdir: join_paths(clutter_clutter_includedir, 'deprecated'))
subdir: join_paths(clutter_clutter_includesubdir, 'deprecated'))
install_headers(clutter_x11_headers,
subdir: join_paths(clutter_clutter_includedir, 'x11'))
subdir: join_paths(clutter_clutter_includesubdir, 'x11'))
pkg.generate(libmutter_clutter,
name: 'Mutters Clutter',

3
clutter/meson.build
View File

@ -1,4 +1,5 @@
clutter_includedir = join_paths(pkgincludedir, 'clutter')
clutter_includesubdir = join_paths(pkgname, 'clutter')
clutter_includedir = join_paths(includedir, clutter_includesubdir)
clutter_srcdir = join_paths(top_srcdir, 'clutter')
clutter_builddir = join_paths(builddir, 'clutter')