[gexiv2/wip/0.12] Make it possible to disable python support
- From: Jens Georg <jensgeorg src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gexiv2/wip/0.12] Make it possible to disable python support
- Date: Wed, 23 May 2018 09:25:34 +0000 (UTC)
commit 5b81e002507118209c7b9e8488204ada8fec82a8
Author: Jens Georg <mail jensge org>
Date: Wed May 23 11:23:08 2018 +0200
Make it possible to disable python support
meson.build | 36 ++++++++++++++++++++----------------
meson_options.txt | 4 ++--
2 files changed, 22 insertions(+), 18 deletions(-)
---
diff --git a/meson.build b/meson.build
index 4313526..4bd6df1 100644
--- a/meson.build
+++ b/meson.build
@@ -25,27 +25,31 @@ python2_girdir = get_option('python2-girdir')
python3_girdir = get_option('python3-girdir')
if introspection_available
- python2 = find_program('python2', required : false)
- if python2.found()
- py2gi = run_command(python2, python_gi_test_args)
- if py2gi.returncode() == 0
- python2_available = true
- if python2_girdir == 'auto'
- python2_girdir = py2gi.stdout().strip()
+ if python2_girdir != 'no'
+ python2 = find_program('python2', required : false)
+ if python2.found()
+ py2gi = run_command(python2, python_gi_test_args)
+ if py2gi.returncode() == 0
+ python2_available = true
+ if python2_girdir == 'auto'
+ python2_girdir = py2gi.stdout().strip()
+ endif
+ install_data('GExiv2.py', install_dir : python2_girdir)
endif
- install_data('GExiv2.py', install_dir : python2_girdir)
endif
endif
- python3 = find_program('python3', required : false)
- if python3.found()
- py3gi = run_command(python3, python_gi_test_args)
- if py3gi.returncode() == 0
- python3_available = true
- if python3_girdir == 'auto'
- python3_girdir = py3gi.stdout().strip()
+ if python3_girdir != 'no'
+ python3 = find_program('python3', required : false)
+ if python3.found()
+ py3gi = run_command(python3, python_gi_test_args)
+ if py3gi.returncode() == 0
+ python3_available = true
+ if python3_girdir == 'auto'
+ python3_girdir = py3gi.stdout().strip()
+ endif
+ install_data('GExiv2.py', install_dir : python3_girdir)
endif
- install_data('GExiv2.py', install_dir : python3_girdir)
endif
endif
endif
diff --git a/meson_options.txt b/meson_options.txt
index 8683518..d21b647 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -1,5 +1,5 @@
option('docs', type: 'boolean', value: false, description: 'Enable or disable generating the API reference
(depends on GTK-Doc)')
option('introspection', type: 'boolean', value : true, description: 'Enable or disable GObject
Introspection')
option('vapi', type: 'boolean', value: true, description: 'Enable or disable generation of vala vapi file')
-option('python2-girdir', type: 'string', value : 'auto', description : 'Installation dir for PyGObject2
overrides')
-option('python3-girdir', type: 'string', value : 'auto', description : 'Installation dir for PyGObject3
overrides')
+option('python2-girdir', type: 'string', value : 'auto', description : 'Installation dir for PyGObject2
overrides (default = auto, no disables python2)')
+option('python3-girdir', type: 'string', value : 'auto', description : 'Installation dir for PyGObject3
overrides (default = auto, no disables python3)')
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]