isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2025-04-25 03:09:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

meson: Set cogl as dependency of libmutter-cogl dependency

Browse Source 
Since a libmutter-cogl dependency is declared as libmutter_cogl_dep, it can be
used to avoid repeating cogl dependency everywhere.

https://gitlab.gnome.org/GNOME/mutter/merge_requests/3955
This commit is contained in:
Marco Trevisan (Treviño) 2019-01-18 00:58:24 +01:00
parent adc5670ea9
commit 3838341d83
6 changed files with 3 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -21,10 +21,7 @@ libmutter_cogl_gles2 = shared_library('mutter-cogl-gles2-' + libmutter_api_versi
include_directories: [cogl_includepath, cogl_path_includepath], include_directories: [cogl_includepath, cogl_path_includepath],
link_depends: libmutter_cogl_gles2_map, link_depends: libmutter_cogl_gles2_map,
link_args: libmutter_cogl_gles2_link_args, link_args: libmutter_cogl_gles2_link_args,
dependencies: [ dependencies: libmutter_cogl_dep,
cogl_deps,
libmutter_cogl_dep
],
install_rpath: pkglibdir, install_rpath: pkglibdir,
install_dir: pkglibdir, install_dir: pkglibdir,
install: true, install: true,

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

@ -15,7 +15,6 @@ cogl_pango_public_headers = [
] ]
cogl_pango_deps = [ cogl_pango_deps = [
cogl_deps,
pango_dep, pango_dep,
pangocairo_dep, pangocairo_dep,
libmutter_cogl_dep, libmutter_cogl_dep,

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

@ -65,7 +65,7 @@ libmutter_cogl_path = shared_library('mutter-cogl-path-' + libmutter_api_version
include_directories: [cogl_includepath, cogl_path_includepath], include_directories: [cogl_includepath, cogl_path_includepath],
link_depends: libmutter_cogl_path_map, link_depends: libmutter_cogl_path_map,
link_args: libmutter_cogl_path_link_args, link_args: libmutter_cogl_path_link_args,
dependencies: [libmutter_cogl_dep, cogl_deps], dependencies: libmutter_cogl_dep,
install_rpath: pkglibdir, install_rpath: pkglibdir,
install_dir: pkglibdir, install_dir: pkglibdir,
install: true, install: true,

1
cogl/cogl/meson.build
View File

@ -485,6 +485,7 @@ libmutter_cogl = shared_library(libmutter_cogl_name,
install: true, install: true,
) )
libmutter_cogl_dep = declare_dependency( libmutter_cogl_dep = declare_dependency(
dependencies: [cogl_deps],
link_with: libmutter_cogl, link_with: libmutter_cogl,
) )

1
cogl/tests/conform/meson.build
View File

@ -93,7 +93,6 @@ libmutter_cogl_test_conformance = executable('test-conformance',
], ],
include_directories: cogl_test_conformance_includes, include_directories: cogl_test_conformance_includes,
dependencies: [ dependencies: [
cogl_deps,
libmutter_cogl_dep, libmutter_cogl_dep,
libmutter_cogl_path_dep, libmutter_cogl_path_dep,
libmutter_cogl_test_fixtures_dep, libmutter_cogl_test_fixtures_dep,

1
cogl/tests/unit/meson.build
View File

@ -16,7 +16,6 @@ libmutter_cogl_test_unit = executable('test-unit',
], ],
include_directories: cogl_test_unit_includes, include_directories: cogl_test_unit_includes,
dependencies: [ dependencies: [
cogl_deps,
libmutter_cogl_dep, libmutter_cogl_dep,
libmutter_cogl_path_dep, libmutter_cogl_path_dep,
libmutter_cogl_test_fixtures_dep, libmutter_cogl_test_fixtures_dep,