brl/mutter
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

build: Make use of defined req variables

Browse Source 
Closes https://gitlab.gnome.org/GNOME/mutter/-/issues/752

Part-of: <https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/3482>
This commit is contained in:
Bilal Elmoussaoui 2024-01-03 12:02:43 +01:00 committed by Marge Bot
parent 50fd53d465
commit a72f44132d
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
cogl/meson.build
View File

@ -15,7 +15,6 @@ cogl_pkg_private_deps = [
cairo_dep, cairo_dep,
gmodule_no_export_dep, gmodule_no_export_dep,
libmutter_mtk_dep, libmutter_mtk_dep,
#uprof_dep,
] ]
if have_profiler if have_profiler

6
meson.build
View File

@ -22,7 +22,6 @@ graphene_req = '>= 1.10.2'
gtk3_req = '>= 3.19.8' gtk3_req = '>= 3.19.8'
gtk4_req = '>= 4.0.0' gtk4_req = '>= 4.0.0'
gdk_pixbuf_req = '>= 2.0' gdk_pixbuf_req = '>= 2.0'
uprof_req = '>= 0.3'
pango_req = '>= 1.46.0' pango_req = '>= 1.46.0'
cairo_req = '>= 1.10.0' cairo_req = '>= 1.10.0'
pangocairo_req = '>= 1.20' pangocairo_req = '>= 1.20'
@ -106,7 +105,7 @@ mutter_installed_tests_libexecdir = libexecdir / 'installed-tests' / libmutter_n
m_dep = cc.find_library('m', required: true) m_dep = cc.find_library('m', required: true)
graphene_dep = dependency('graphene-gobject-1.0', version: graphene_req) graphene_dep = dependency('graphene-gobject-1.0', version: graphene_req)
gdk_pixbuf_dep = dependency('gdk-pixbuf-2.0') gdk_pixbuf_dep = dependency('gdk-pixbuf-2.0', version: gdk_pixbuf_req)
pango_dep = dependency('pango', version: pango_req) pango_dep = dependency('pango', version: pango_req)
cairo_dep = dependency('cairo', version: cairo_req) cairo_dep = dependency('cairo', version: cairo_req)
cairo_gobject_dep = dependency('cairo-gobject', version: cairo_req) cairo_gobject_dep = dependency('cairo-gobject', version: cairo_req)
@ -318,7 +317,7 @@ endif
have_introspection = get_option('introspection') have_introspection = get_option('introspection')
if have_introspection if have_introspection
gobject_introspection_dep = dependency('gobject-introspection-1.0') gobject_introspection_dep = dependency('gobject-introspection-1.0', version: gi_req)
introspection_args = [ introspection_args = [
'--quiet', '--quiet',
@ -437,6 +436,7 @@ if have_profiler
'help=false', 'help=false',
], ],
fallback: ['sysprof', 'libsysprof_capture_dep'], fallback: ['sysprof', 'libsysprof_capture_dep'],
version: sysprof_req,
) )
if libsysprof_capture_dep.type_name() == 'pkgconfig' if libsysprof_capture_dep.type_name() == 'pkgconfig'