varun-r-mallya/sysprof
1
0
Fork 0
mirror of https://github.com/varun-r-mallya/sysprof.git synced 2026-02-10 15:10:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

build: cleanup dependency checking

Browse Source 
We always require polkit now, so that we can fallback when we fail to
communicate with the peer.
This commit is contained in:
Christian Hergert
2019-05-10 12:53:19 -07:00
parent eacdc47c34
commit 623d7ad027
5 changed files with 21 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
meson.build
View File

@ -47,8 +47,17 @@ if get_option('default_library') != 'static'
endif endif
endif endif
if get_option('with_sysprofd') != 'none' glib_dep = dependency('glib-2.0', version: glib_req_version)
config_h.set10('ENABLE_POLKIT', true) gio_dep = dependency('gio-2.0', version: glib_req_version)
gio_unix_dep = dependency('gio-unix-2.0', version: glib_req_version)
gtk_dep = dependency('gtk+-3.0', version: gtk_req_version)
# If we find polkit 0.114, we don't need to backport autoptr cleanups
polkit_dep = dependency('polkit-gobject-1', version: '0.114', required: false)
if polkit_dep.found()
config_h.set10('HAVE_POLKIT_AUTOPTR', true)
else
polkit_dep = dependency('polkit-gobject-1', version: polkit_req_version)
endif endif
debugdir = get_option('debugdir') debugdir = get_option('debugdir')

2
src/libsysprof-capture/meson.build
View File

@ -30,7 +30,7 @@ configure_file(
) )
libsysprof_capture_deps = [ libsysprof_capture_deps = [
dependency('glib-2.0', version: glib_req_version), glib_dep,
] ]
libsysprof_capture = static_library( libsysprof_capture = static_library(

4
src/libsysprof-ui/meson.build
View File

@ -54,8 +54,8 @@ libsysprof_ui_resources = gnome.compile_resources(
) )
libsysprof_ui_deps = [ libsysprof_ui_deps = [
dependency('gio-2.0', version: glib_req_version), gio_dep,
dependency('gtk+-3.0', version: gtk_req_version), gtk_dep,
libsysprof_dep, libsysprof_dep,
] ]

9
src/libsysprof/meson.build
View File

@ -58,8 +58,9 @@ libsysprof_public_sources += libsysprof_capture_sources
libsysprof_public_headers += libsysprof_capture_headers libsysprof_public_headers += libsysprof_capture_headers
libsysprof_deps = [ libsysprof_deps = [
dependency('gio-2.0', version: glib_req_version), gio_dep,
dependency('gio-unix-2.0', version: glib_req_version), gio_unix_dep,
polkit_dep,
] ]
if host_machine.system() == 'linux' if host_machine.system() == 'linux'
@ -89,10 +90,6 @@ if host_machine.system() != 'darwin'
libsysprof_deps += [cxx.find_library('stdc++')] libsysprof_deps += [cxx.find_library('stdc++')]
endif endif
if get_option('with_sysprofd') != 'none'
libsysprof_deps += dependency('polkit-gobject-1')
endif
libsysprof = shared_library( libsysprof = shared_library(
'sysprof-@0@'.format(libsysprof_api_version), 'sysprof-@0@'.format(libsysprof_api_version),
libsysprof_public_sources + libsysprof_private_sources, libsysprof_public_sources + libsysprof_private_sources,

8
src/sysprofd/meson.build
View File

@ -10,10 +10,10 @@ sysprofd_sources = [
pkglibexecdir = join_paths(get_option('prefix'), get_option('libexecdir')) pkglibexecdir = join_paths(get_option('prefix'), get_option('libexecdir'))
sysprofd_deps = [ sysprofd_deps = [
dependency('glib-2.0', version: glib_req_version), glib_dep,
dependency('gio-2.0', version: glib_req_version), gio_dep,
dependency('gio-unix-2.0', version: glib_req_version), gio_unix_dep,
dependency('polkit-gobject-1', version: polkit_req_version), polkit_dep,
] ]
sysprofd = executable('sysprofd', sysprofd_sources, sysprofd = executable('sysprofd', sysprofd_sources,