isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2024-11-25 09:30:45 -05: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
Show Stats 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_clutter_includedir = join_paths(clutter_includedir, 'clutter')
clutter_headers = [ clutter_headers = [
@ -577,16 +578,16 @@ if have_introspection
endif endif
install_headers(clutter_headers, install_headers(clutter_headers,
subdir: clutter_clutter_includedir) subdir: clutter_clutter_includesubdir)
install_headers(cally_headers, install_headers(cally_headers,
subdir: join_paths(clutter_includedir, 'cally')) subdir: join_paths(clutter_includesubdir, 'cally'))
install_headers(clutter_deprecated_headers, install_headers(clutter_deprecated_headers,
subdir: join_paths(clutter_clutter_includedir, 'deprecated')) subdir: join_paths(clutter_clutter_includesubdir, 'deprecated'))
install_headers(clutter_x11_headers, install_headers(clutter_x11_headers,
subdir: join_paths(clutter_clutter_includedir, 'x11')) subdir: join_paths(clutter_clutter_includesubdir, 'x11'))
pkg.generate(libmutter_clutter, pkg.generate(libmutter_clutter,
name: 'Mutters 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_srcdir = join_paths(top_srcdir, 'clutter')
clutter_builddir = join_paths(builddir, 'clutter') clutter_builddir = join_paths(builddir, 'clutter')

4
cogl/cogl-gles2/meson.build
View File

@ -27,9 +27,9 @@ libmutter_cogl_gles2 = shared_library('mutter-cogl-gles2-' + libmutter_api_versi
install: true, install: true,
) )
cogl_gles2_includedir = join_paths(cogl_includedir, 'cogl-gles2/GLES2') cogl_gles2_includesubdir = join_paths(cogl_includesubdir, 'cogl-gles2/GLES2')
install_headers(cogl_gles2_public_headers, install_headers(cogl_gles2_public_headers,
subdir: cogl_gles2_includedir) subdir: cogl_gles2_includesubdir)
pkg.generate(libmutter_cogl_gles2, pkg.generate(libmutter_cogl_gles2,
name: 'CoglGles2', name: 'CoglGles2',

4
cogl/cogl-pango/meson.build
View File

@ -70,8 +70,8 @@ if have_introspection
) )
endif endif
cogl_pango_includedir = join_paths(cogl_includedir, 'cogl-pango') cogl_pango_includesubdir = join_paths(cogl_includesubdir, 'cogl-pango')
install_headers(cogl_pango_public_headers, subdir: cogl_pango_includedir) install_headers(cogl_pango_public_headers, subdir: cogl_pango_includesubdir)
pkg.generate(libmutter_cogl_pango, pkg.generate(libmutter_cogl_pango,
name: 'CoglPango', name: 'CoglPango',

3
cogl/cogl-path/meson.build
View File

@ -1,3 +1,4 @@
cogl_path_includesubdir = join_paths(cogl_includesubdir, 'cogl-path')
cogl_path_includedir = join_paths(cogl_includedir, 'cogl-path') cogl_path_includedir = join_paths(cogl_includedir, 'cogl-path')
cogl_path_public_headers = [ cogl_path_public_headers = [
@ -76,7 +77,7 @@ libmutter_cogl_path_dep = declare_dependency(
) )
install_headers(cogl_path_public_headers, install_headers(cogl_path_public_headers,
subdir: cogl_path_includedir) subdir: cogl_path_includesubdir)
pkg.generate(libmutter_cogl_path, pkg.generate(libmutter_cogl_path,
name: 'CoglPath', name: 'CoglPath',

7
cogl/cogl/meson.build
View File

@ -1,3 +1,4 @@
cogl_cogl_includesubdir = join_paths(cogl_includesubdir, 'cogl')
cogl_cogl_includedir = join_paths(cogl_includedir, 'cogl') cogl_cogl_includedir = join_paths(cogl_includedir, 'cogl')
cdata = configuration_data() cdata = configuration_data()
@ -514,16 +515,16 @@ install_headers([
cogl_headers, cogl_headers,
cogl_nonintrospected_headers, cogl_nonintrospected_headers,
], ],
subdir: cogl_cogl_includedir) subdir: cogl_cogl_includesubdir)
install_headers([ install_headers([
cogl_deprecated_headers, cogl_deprecated_headers,
cogl_deprecated_nonintrospected_headers, cogl_deprecated_nonintrospected_headers,
], ],
subdir: join_paths(cogl_cogl_includedir, 'deprecated')) subdir: join_paths(cogl_cogl_includesubdir, 'deprecated'))
install_headers(cogl_gl_prototype_headers, install_headers(cogl_gl_prototype_headers,
subdir: join_paths(cogl_cogl_includedir, 'gl-prototypes')) subdir: join_paths(cogl_cogl_includesubdir, 'gl-prototypes'))
pkg.generate(libmutter_cogl, pkg.generate(libmutter_cogl,
name: 'Cogl', name: 'Cogl',

3
cogl/meson.build
View File

@ -1,4 +1,5 @@
cogl_includedir = join_paths(pkgincludedir, 'cogl') cogl_includesubdir = join_paths(pkgname, 'cogl')
cogl_includedir = join_paths(includedir, cogl_includesubdir)
cogl_srcdir = join_paths(top_srcdir, 'cogl') cogl_srcdir = join_paths(top_srcdir, 'cogl')
cogl_builddir = join_paths(builddir, 'cogl') cogl_builddir = join_paths(builddir, 'cogl')

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 = [ mutter_includes = [
include_directories('.'), include_directories('.'),

2
src/meta/meson.build
View File

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