isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2025-06-13 16:59: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

3
src/meson.build
View File

@ -1,4 +1,5 @@
mutter_includedir = join_paths(pkgincludedir, 'meta')
mutter_includesubdir = join_paths(pkgname, 'meta')
mutter_includedir = join_paths(includedir, mutter_includesubdir)
mutter_includes = [
include_directories('.'),

2
src/meta/meson.build
View File

@ -48,7 +48,7 @@ if have_x11
endif
install_headers(mutter_public_headers,
subdir: mutter_includedir
subdir: mutter_includesubdir
)
mutter_public_header_files = files(mutter_public_headers)