[libgda] Options: renamed enable-tools to tools
- From: Daniel Espinosa Ortiz <despinosa src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [libgda] Options: renamed enable-tools to tools
- Date: Sun, 31 Jan 2021 22:43:05 +0000 (UTC)
commit ad72c785877f5e3cb5fa2a189f418b9cee2b19ef
Author: Daniel Espinosa <esodan gmail com>
Date: Sun Jan 31 14:53:14 2021 -0600
Options: renamed enable-tools to tools
Construct GDA Browser is now conditioned to
experimental also with-help option was renamed
to help
meson.build | 2 +-
meson_options.txt | 4 ++--
tools/meson.build | 2 ++
3 files changed, 5 insertions(+), 3 deletions(-)
---
diff --git a/meson.build b/meson.build
index 1a5df1544..758040ae3 100644
--- a/meson.build
+++ b/meson.build
@@ -415,7 +415,7 @@ install_data(libgda_report_pc,
)
endif
-if get_option('enable-tools')
+if get_option('experimental') and get_option('tools')
subdir('tools')
endif
subdir('tests')
diff --git a/meson_options.txt b/meson_options.txt
index 7bb0aeb13..25a2882ca 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -1,6 +1,6 @@
option('ui', type : 'boolean', value : true, description : 'Enable GTK+ extension and tools')
#option('gtksourceview', type : 'boolean', value : false, description : 'Enable using GtkSourceView')
-option('with-help', type : 'boolean', value : true, description : 'Enable building help (GdaBrowser)')
+option('help', type : 'boolean', value : true, description : 'Enable building help (GdaBrowser)')
option('with-goocanvas', type : 'boolean', value : false, description : 'Enable using GooCanvas')
option('with-graphviz', type : 'boolean', value : false, description : 'Enable using Graphviz')
option('enable-json', type : 'boolean', value : true, description : 'Enable support for JSON, disabled by
default')
@@ -10,7 +10,7 @@ option('with-libsoup', type : 'boolean', value : true, description : 'Enable lib
option('with-libsecret', type : 'boolean', value : false, description : 'Enable libsecret support')
option('with-gnome-keyring', type : 'boolean', value : false, description : 'Enable gnome-keyring support')
option('with-examples', type : 'boolean', value : false, description : 'Compile examples [default=false')
-option('enable-tools', type : 'boolean', value : false, description : 'Enable build experimental GUI Tools')
+option('tools', type : 'boolean', value : false, description : 'Enable build experimental GUI Tools')
option('glade-catalog-dir', type : 'string', value : '', description : 'Use the given directory to install
glade catalog files. If glade is not available this option is ignored. If it is not given the valaue from
pkg-config will be used')
option('glade-pixmap-dir', type : 'string', value : '', description : 'Use the given directory to install
glade pixmap files. If glade is not available this option is ignored. If it is not given the valaue from
pkg-config will be used')
option('gtk_doc', type : 'boolean', value : false, description : 'Enable documentation generation [default =
false]')
diff --git a/tools/meson.build b/tools/meson.build
index e5562fd6e..69f717a62 100644
--- a/tools/meson.build
+++ b/tools/meson.build
@@ -4,7 +4,9 @@ inc_browserh_dep = declare_dependency (include_directories : inc_browserh)
subdir('misc')
subdir('common')
subdir('base')
+if get_option('help')
subdir('help')
+endif
gda_sql_sources = files([
'tools-main.c'
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]