Commit 3838341d authored by Marco Trevisan's avatar Marco Trevisan 🎺

meson: Set cogl as dependency of libmutter-cogl dependency

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
parent adc5670e
...@@ -21,10 +21,7 @@ libmutter_cogl_gles2 = shared_library('mutter-cogl-gles2-' + libmutter_api_versi ...@@ -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,
......
...@@ -15,7 +15,6 @@ cogl_pango_public_headers = [ ...@@ -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,
......
...@@ -65,7 +65,7 @@ libmutter_cogl_path = shared_library('mutter-cogl-path-' + libmutter_api_version ...@@ -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,
......
...@@ -485,6 +485,7 @@ libmutter_cogl = shared_library(libmutter_cogl_name, ...@@ -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,
) )
......
...@@ -93,7 +93,6 @@ libmutter_cogl_test_conformance = executable('test-conformance', ...@@ -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,
......
...@@ -16,7 +16,6 @@ libmutter_cogl_test_unit = executable('test-unit', ...@@ -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,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment