From 66b113ac83d204de44b4d3ee01a34d464c2cbc94 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?I=C3=B1igo=20Mart=C3=ADnez?= Date: Sun, 12 Nov 2017 10:51:48 +0100 Subject: [PATCH] project: Rename build options Following the new meson porting guidelines, this patch renames the build options. The list of changes is as follows: - Remove the enable prefix from boolean options. - The character separator from multi-word options has been changed to underscore. https://bugzilla.gnome.org/show_bug.cgi?id=790234 --- configure | 2 +- meson.build | 4 ++-- meson_options.txt | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/configure b/configure index 6ee3185a..fc9b359f 100755 --- a/configure +++ b/configure @@ -159,7 +159,7 @@ END cmd_options="" for key in "${!meson_options[@]}"; do - cmd_options="$cmd_options -Denable-$key=${meson_options[$key]}" + cmd_options="$cmd_options -D${key/\-/_}=${meson_options[$key]}" done exec ${MESON} \ diff --git a/meson.build b/meson.build index 276be940..9b1aa15c 100644 --- a/meson.build +++ b/meson.build @@ -36,8 +36,8 @@ calendar_schemadir = join_paths(calendar_datadir, 'glib-2.0', 'schemas') calendar_buildtype = get_option('buildtype') calendar_debug = calendar_minor_version.is_odd() or buildtype.contains('debug') -enable_tracing = get_option('enable-tracing') -enable_gtk_doc = get_option('enable-gtk-doc') +enable_tracing = get_option('tracing') +enable_gtk_doc = get_option('gtk_doc') cc = meson.get_compiler('c') diff --git a/meson_options.txt b/meson_options.txt index b8d65a56..063b8cb0 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -1,2 +1,2 @@ -option('enable-tracing', type: 'boolean', value: false, description: 'add extra debugging information') -option('enable-gtk-doc', type: 'boolean', value: false, description: 'use gtk-doc to build documentation') +option('tracing', type: 'boolean', value: false, description: 'add extra debugging information') +option('gtk_doc', type: 'boolean', value: false, description: 'use gtk-doc to build documentation')