diff options
author | Jonas Ådahl <jadahl@gmail.com> | 2019-01-08 09:05:08 +0100 |
---|---|---|
committer | Jonas Ådahl <jadahl@gmail.com> | 2019-01-08 09:05:08 +0100 |
commit | 73ddd7cd48b84860a1ed678f1a88a05d59ddb65e (patch) | |
tree | c8f85286bb169d7889f03e6e1b98ca2397e5f971 | |
parent | e7fb45364a64934484302e38b1f306f1a86b71e4 (diff) | |
download | mutter-73ddd7cd48b84860a1ed678f1a88a05d59ddb65e.tar.gz |
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.
-rw-r--r-- | clutter/clutter/meson.build | 8 | ||||
-rw-r--r-- | cogl/cogl-gles2/meson.build | 3 | ||||
-rw-r--r-- | cogl/cogl-pango/meson.build | 3 | ||||
-rw-r--r-- | cogl/cogl-path/meson.build | 3 | ||||
-rw-r--r-- | cogl/cogl/meson.build | 4 | ||||
-rw-r--r-- | src/meson.build | 3 |
6 files changed, 10 insertions, 14 deletions
diff --git a/clutter/clutter/meson.build b/clutter/clutter/meson.build index ed3befbef..828525770 100644 --- a/clutter/clutter/meson.build +++ b/clutter/clutter/meson.build @@ -625,11 +625,11 @@ install_headers(clutter_deprecated_headers, install_headers(clutter_x11_headers, subdir: join_paths(clutter_clutter_includedir, 'x11')) -pkg.generate( +pkg.generate(libmutter_clutter, name: 'Mutters Clutter', filebase: libmutter_clutter_name, description: 'Mutters Clutter Private Library', - libraries: [libmutter_clutter, m_dep], + libraries: [m_dep], subdirs: join_paths(pkgname, 'clutter'), requires: [clutter_pkg_deps, libmutter_cogl_name], version: meson.project_version(), @@ -638,11 +638,11 @@ pkg.generate( ], ) -pkg.generate( +pkg.generate(libmutter_clutter, name: 'Mutters ClutterX11', filebase: 'mutter-clutter-x11-' + libmutter_api_version, description: 'Mutters ClutterX11 Private Library', - libraries: [libmutter_clutter, m_dep], + libraries: [m_dep], subdirs: join_paths(pkgname, 'clutter'), requires: [clutter_pkg_deps, libmutter_cogl_name], version: meson.project_version(), diff --git a/cogl/cogl-gles2/meson.build b/cogl/cogl-gles2/meson.build index 1b144da1d..3794d779b 100644 --- a/cogl/cogl-gles2/meson.build +++ b/cogl/cogl-gles2/meson.build @@ -27,11 +27,10 @@ cogl_gles2_includedir = join_paths(cogl_includedir, 'cogl-gles2/GLES2') install_headers(cogl_gles2_public_headers, subdir: cogl_gles2_includedir) -pkg.generate( +pkg.generate(libmutter_cogl_gles2, name: 'CoglGles2', filebase: 'mutter-cogl-gles2-' + libmutter_api_version, description: 'A cogl GLES2 helper library for mutter', - libraries: [libmutter_cogl_gles2], subdirs: join_paths(pkgname, 'cogl'), requires: [cogl_pkg_deps, libmutter_cogl_name], version: meson.project_version(), diff --git a/cogl/cogl-pango/meson.build b/cogl/cogl-pango/meson.build index 90802d07c..6affbfcf6 100644 --- a/cogl/cogl-pango/meson.build +++ b/cogl/cogl-pango/meson.build @@ -67,11 +67,10 @@ endif cogl_pango_includedir = join_paths(cogl_includedir, 'cogl-pango') install_headers(cogl_pango_public_headers, subdir: cogl_pango_includedir) -pkg.generate( +pkg.generate(libmutter_cogl_pango, name: 'CoglPango', filebase: 'mutter-cogl-pango-' + libmutter_api_version, description: 'A text rendering for Cogl in mutter', - libraries: [libmutter_cogl_pango], subdirs: join_paths(pkgname, 'cogl'), requires: [cogl_pkg_deps, libmutter_cogl_name], version: meson.project_version(), diff --git a/cogl/cogl-path/meson.build b/cogl/cogl-path/meson.build index bc6656db9..fe9395f97 100644 --- a/cogl/cogl-path/meson.build +++ b/cogl/cogl-path/meson.build @@ -68,11 +68,10 @@ libmutter_cogl_path_dep = declare_dependency( install_headers(cogl_path_public_headers, subdir: cogl_path_includedir) -pkg.generate( +pkg.generate(libmutter_cogl_path, name: 'CoglPath', filebase: 'mutter-cogl-path-' + libmutter_api_version, description: 'A 2D path drawing library for Cogl in mutter', - libraries: [libmutter_cogl_path], subdirs: join_paths(pkgname, 'cogl'), requires: [cogl_pkg_deps, libmutter_cogl_name], version: meson.project_version(), diff --git a/cogl/cogl/meson.build b/cogl/cogl/meson.build index 45f2726f9..8501af963 100644 --- a/cogl/cogl/meson.build +++ b/cogl/cogl/meson.build @@ -517,11 +517,11 @@ install_headers([ install_headers(cogl_gl_prototype_headers, subdir: join_paths(cogl_cogl_includedir, 'gl-prototypes')) -pkg.generate( +pkg.generate(libmutter_cogl, name: 'Cogl', filebase: libmutter_cogl_name, description: 'An object oriented GL/GLES Abstraction/Utility Layer in mutter', - libraries: [libmutter_cogl, m_dep], + libraries: [m_dep], subdirs: join_paths(pkgname, 'cogl'), requires: [cogl_pkg_deps], version: meson.project_version(), diff --git a/src/meson.build b/src/meson.build index 3fad9eda7..58134967b 100644 --- a/src/meson.build +++ b/src/meson.build @@ -833,11 +833,10 @@ if have_introspection ) endif -pkg.generate( +pkg.generate(libmutter, name: 'Meta', filebase: 'libmutter-' + libmutter_api_version, description: 'Mutter compositor and window manager library', - libraries: [libmutter], subdirs: pkgname, requires: [mutter_pkg_deps, libmutter_clutter_name], version: meson.project_version(), |