build: Pass library as first argument to pkg.generate()
Dependencies are added automatically, and we no longer get warnings like: clutter/clutter/meson.build:628: DEPRECATION: Library mutter-clutter-4 was passed to the "libraries" keyword argument of a previous call to generate() method instead of first positional argument. Adding mutter-clutter-4 to "Requires" field, but this is a deprecated behaviour that will change in a future version of Meson. Please report the issue if this warning cannot be avoided in your case.
This commit is contained in:
parent
e7fb45364a
commit
73ddd7cd48
@ -625,11 +625,11 @@ install_headers(clutter_deprecated_headers,
|
|||||||
install_headers(clutter_x11_headers,
|
install_headers(clutter_x11_headers,
|
||||||
subdir: join_paths(clutter_clutter_includedir, 'x11'))
|
subdir: join_paths(clutter_clutter_includedir, 'x11'))
|
||||||
|
|
||||||
pkg.generate(
|
pkg.generate(libmutter_clutter,
|
||||||
name: 'Mutters Clutter',
|
name: 'Mutters Clutter',
|
||||||
filebase: libmutter_clutter_name,
|
filebase: libmutter_clutter_name,
|
||||||
description: 'Mutters Clutter Private Library',
|
description: 'Mutters Clutter Private Library',
|
||||||
libraries: [libmutter_clutter, m_dep],
|
libraries: [m_dep],
|
||||||
subdirs: join_paths(pkgname, 'clutter'),
|
subdirs: join_paths(pkgname, 'clutter'),
|
||||||
requires: [clutter_pkg_deps, libmutter_cogl_name],
|
requires: [clutter_pkg_deps, libmutter_cogl_name],
|
||||||
version: meson.project_version(),
|
version: meson.project_version(),
|
||||||
@ -638,11 +638,11 @@ pkg.generate(
|
|||||||
],
|
],
|
||||||
)
|
)
|
||||||
|
|
||||||
pkg.generate(
|
pkg.generate(libmutter_clutter,
|
||||||
name: 'Mutters ClutterX11',
|
name: 'Mutters ClutterX11',
|
||||||
filebase: 'mutter-clutter-x11-' + libmutter_api_version,
|
filebase: 'mutter-clutter-x11-' + libmutter_api_version,
|
||||||
description: 'Mutters ClutterX11 Private Library',
|
description: 'Mutters ClutterX11 Private Library',
|
||||||
libraries: [libmutter_clutter, m_dep],
|
libraries: [m_dep],
|
||||||
subdirs: join_paths(pkgname, 'clutter'),
|
subdirs: join_paths(pkgname, 'clutter'),
|
||||||
requires: [clutter_pkg_deps, libmutter_cogl_name],
|
requires: [clutter_pkg_deps, libmutter_cogl_name],
|
||||||
version: meson.project_version(),
|
version: meson.project_version(),
|
||||||
|
@ -27,11 +27,10 @@ cogl_gles2_includedir = join_paths(cogl_includedir, 'cogl-gles2/GLES2')
|
|||||||
install_headers(cogl_gles2_public_headers,
|
install_headers(cogl_gles2_public_headers,
|
||||||
subdir: cogl_gles2_includedir)
|
subdir: cogl_gles2_includedir)
|
||||||
|
|
||||||
pkg.generate(
|
pkg.generate(libmutter_cogl_gles2,
|
||||||
name: 'CoglGles2',
|
name: 'CoglGles2',
|
||||||
filebase: 'mutter-cogl-gles2-' + libmutter_api_version,
|
filebase: 'mutter-cogl-gles2-' + libmutter_api_version,
|
||||||
description: 'A cogl GLES2 helper library for mutter',
|
description: 'A cogl GLES2 helper library for mutter',
|
||||||
libraries: [libmutter_cogl_gles2],
|
|
||||||
subdirs: join_paths(pkgname, 'cogl'),
|
subdirs: join_paths(pkgname, 'cogl'),
|
||||||
requires: [cogl_pkg_deps, libmutter_cogl_name],
|
requires: [cogl_pkg_deps, libmutter_cogl_name],
|
||||||
version: meson.project_version(),
|
version: meson.project_version(),
|
||||||
|
@ -67,11 +67,10 @@ endif
|
|||||||
cogl_pango_includedir = join_paths(cogl_includedir, 'cogl-pango')
|
cogl_pango_includedir = join_paths(cogl_includedir, 'cogl-pango')
|
||||||
install_headers(cogl_pango_public_headers, subdir: cogl_pango_includedir)
|
install_headers(cogl_pango_public_headers, subdir: cogl_pango_includedir)
|
||||||
|
|
||||||
pkg.generate(
|
pkg.generate(libmutter_cogl_pango,
|
||||||
name: 'CoglPango',
|
name: 'CoglPango',
|
||||||
filebase: 'mutter-cogl-pango-' + libmutter_api_version,
|
filebase: 'mutter-cogl-pango-' + libmutter_api_version,
|
||||||
description: 'A text rendering for Cogl in mutter',
|
description: 'A text rendering for Cogl in mutter',
|
||||||
libraries: [libmutter_cogl_pango],
|
|
||||||
subdirs: join_paths(pkgname, 'cogl'),
|
subdirs: join_paths(pkgname, 'cogl'),
|
||||||
requires: [cogl_pkg_deps, libmutter_cogl_name],
|
requires: [cogl_pkg_deps, libmutter_cogl_name],
|
||||||
version: meson.project_version(),
|
version: meson.project_version(),
|
||||||
|
@ -68,11 +68,10 @@ 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_includedir)
|
||||||
|
|
||||||
pkg.generate(
|
pkg.generate(libmutter_cogl_path,
|
||||||
name: 'CoglPath',
|
name: 'CoglPath',
|
||||||
filebase: 'mutter-cogl-path-' + libmutter_api_version,
|
filebase: 'mutter-cogl-path-' + libmutter_api_version,
|
||||||
description: 'A 2D path drawing library for Cogl in mutter',
|
description: 'A 2D path drawing library for Cogl in mutter',
|
||||||
libraries: [libmutter_cogl_path],
|
|
||||||
subdirs: join_paths(pkgname, 'cogl'),
|
subdirs: join_paths(pkgname, 'cogl'),
|
||||||
requires: [cogl_pkg_deps, libmutter_cogl_name],
|
requires: [cogl_pkg_deps, libmutter_cogl_name],
|
||||||
version: meson.project_version(),
|
version: meson.project_version(),
|
||||||
|
@ -517,11 +517,11 @@ install_headers([
|
|||||||
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_includedir, 'gl-prototypes'))
|
||||||
|
|
||||||
pkg.generate(
|
pkg.generate(libmutter_cogl,
|
||||||
name: 'Cogl',
|
name: 'Cogl',
|
||||||
filebase: libmutter_cogl_name,
|
filebase: libmutter_cogl_name,
|
||||||
description: 'An object oriented GL/GLES Abstraction/Utility Layer in mutter',
|
description: 'An object oriented GL/GLES Abstraction/Utility Layer in mutter',
|
||||||
libraries: [libmutter_cogl, m_dep],
|
libraries: [m_dep],
|
||||||
subdirs: join_paths(pkgname, 'cogl'),
|
subdirs: join_paths(pkgname, 'cogl'),
|
||||||
requires: [cogl_pkg_deps],
|
requires: [cogl_pkg_deps],
|
||||||
version: meson.project_version(),
|
version: meson.project_version(),
|
||||||
|
@ -833,11 +833,10 @@ if have_introspection
|
|||||||
)
|
)
|
||||||
endif
|
endif
|
||||||
|
|
||||||
pkg.generate(
|
pkg.generate(libmutter,
|
||||||
name: 'Meta',
|
name: 'Meta',
|
||||||
filebase: 'libmutter-' + libmutter_api_version,
|
filebase: 'libmutter-' + libmutter_api_version,
|
||||||
description: 'Mutter compositor and window manager library',
|
description: 'Mutter compositor and window manager library',
|
||||||
libraries: [libmutter],
|
|
||||||
subdirs: pkgname,
|
subdirs: pkgname,
|
||||||
requires: [mutter_pkg_deps, libmutter_clutter_name],
|
requires: [mutter_pkg_deps, libmutter_clutter_name],
|
||||||
version: meson.project_version(),
|
version: meson.project_version(),
|
||||||
|
Loading…
Reference in New Issue
Block a user