From c6d7f6effb0e9559cbb622e3f0612280f3dcaf2f Mon Sep 17 00:00:00 2001 From: Daniel Espinosa Date: Sun, 7 Jul 2019 20:59:56 -0500 Subject: [PATCH] meson: Rename options --- gxml/meson.build | 4 ++-- meson.build | 2 +- meson_options.txt | 6 +++--- test/meson.build | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/gxml/meson.build b/gxml/meson.build index 8c080be6..7d399012 100644 --- a/gxml/meson.build +++ b/gxml/meson.build @@ -170,10 +170,10 @@ libgxml = library(VERSIONED_PROJECT_NAME, true, join_paths (get_option('includedir'), 'gxml-@0@'.format (API_VERSION), 'gxml'), vapidir, - not get_option('disable-introspection') + get_option('introspection') ]) -if not get_option('disable-introspection') +if get_option('introspection') g_ir_compiler = find_program('g-ir-compiler', required: false) if g_ir_compiler.found() custom_target('typelib', diff --git a/meson.build b/meson.build index 87b927c9..44666e5c 100644 --- a/meson.build +++ b/meson.build @@ -22,7 +22,7 @@ inc_rooth_dep = declare_dependency (include_directories : inc_rooth) subdir('po') subdir('vapi') subdir('gxml') -if not get_option('disable-valadocs') +if get_option('docs') subdir('docs') endif subdir('test') diff --git a/meson_options.txt b/meson_options.txt index b55f11f3..7e9f059e 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -1,3 +1,3 @@ -option('enable-tnode-tests', type : 'boolean', value : false, description : 'Enable TNode classes unit tests') -option('disable-introspection', type : 'boolean', value : true, description : 'Disable GObject Introspection') -option('disable-valadocs', type : 'boolean', value : true, description : 'Disable Vala Documentation') +option('tnode-tests', type : 'boolean', value : false, description : 'Add TNode classes unit tests') +option('introspection', type : 'boolean', value : false, description : 'Create GObject Introspection file definitions') +option('docs', type : 'boolean', value : false, description : 'Generate Vala Documentation') diff --git a/test/meson.build b/test/meson.build index ed62594e..d9636b32 100644 --- a/test/meson.build +++ b/test/meson.build @@ -21,7 +21,7 @@ files_tests = files ([ ]) tests_cargs = [] -if get_option('enable-tnode-tests') +if get_option('tnode-tests') files_tests += files ([ 'EnumerationTest.vala', -- GitLab