[gtk/ebassi/for-master: 1/2] build: Make sysprof truly optional
- From: Emmanuele Bassi <ebassi src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk/ebassi/for-master: 1/2] build: Make sysprof truly optional
- Date: Fri, 4 Sep 2020 11:10:03 +0000 (UTC)
commit 1896d7f463561f43e99aa0dfa1e3032849e84738
Author: Emmanuele Bassi <ebassi gnome org>
Date: Fri Sep 4 12:02:15 2020 +0100
build: Make sysprof truly optional
We are falling back to the sysprof subproject even if sysprof support
has been explicitly disabled.
Fixes: #3118
meson.build | 62 +++++++++++++++++++++++++++++++++----------------------------
1 file changed, 34 insertions(+), 28 deletions(-)
---
diff --git a/meson.build b/meson.build
index c520298a84..1ef6b16f2c 100644
--- a/meson.build
+++ b/meson.build
@@ -672,35 +672,41 @@ cloudproviders_dep = dependency('cloudproviders',
])
cdata.set('HAVE_CLOUDPROVIDERS', cloudproviders_dep.found())
-profiler_enabled = get_option('sysprof').enabled()
# libsysprof-capture support
-libsysprof_capture_dep = dependency('sysprof-capture-4',
- required: get_option('sysprof'),
- default_options: [
- 'enable_examples=false',
- 'enable_gtk=false',
- 'enable_tests=false',
- 'enable_tools=false',
- 'libsysprof=true',
- 'with_sysprofd=none',
- 'help=false',
- ],
- fallback: ['sysprof', 'libsysprof_capture_dep'],
-)
-cdata.set('HAVE_SYSPROF', libsysprof_capture_dep.found())
-libsysprof_dep = dependency('sysprof-4',
- required: false,
- default_options: [
- 'enable_examples=false',
- 'enable_gtk=false',
- 'enable_tests=false',
- 'enable_tools=false',
- 'libsysprof=true',
- 'with_sysprofd=none',
- 'help=false',
- ],
- fallback: ['sysprof', 'libsysprof_dep'],
-)
+if not get_option('sysprof').disabled()
+ libsysprof_capture_dep = dependency('sysprof-capture-4',
+ required: get_option('sysprof'),
+ default_options: [
+ 'enable_examples=false',
+ 'enable_gtk=false',
+ 'enable_tests=false',
+ 'enable_tools=false',
+ 'libsysprof=true',
+ 'with_sysprofd=none',
+ 'help=false',
+ ],
+ fallback: ['sysprof', 'libsysprof_capture_dep'],
+ )
+ cdata.set('HAVE_SYSPROF', libsysprof_capture_dep.found())
+ libsysprof_dep = dependency('sysprof-4',
+ required: false,
+ default_options: [
+ 'enable_examples=false',
+ 'enable_gtk=false',
+ 'enable_tests=false',
+ 'enable_tools=false',
+ 'libsysprof=true',
+ 'with_sysprofd=none',
+ 'help=false',
+ ],
+ fallback: ['sysprof', 'libsysprof_dep'],
+ )
+ profiler_enabled = true
+else
+ libsysprof_capture_dep = disabler()
+ libsysprof_dep = disabler()
+ profiler_enabled = false
+endif
graphene_dep_type = graphene_dep.type_name()
if graphene_dep_type == 'pkgconfig'
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]