summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristoph Reiter <reiter.christoph@gmail.com>2019-01-06 11:29:23 +0100
committerChristoph Reiter <reiter.christoph@gmail.com>2019-01-06 11:29:23 +0100
commit4e1ada2070a2626c82bd510f5165e5557c7d0608 (patch)
tree02d5300426d71d0c4237bea2431c138cde086701
parent6a11cde78591acc37fe9162bcaf26cde10413436 (diff)
downloadgobject-introspection-4e1ada2070a2626c82bd510f5165e5557c7d0608.tar.gz
meson: warn that not all tests will be run if building without cairo/doctool
-rw-r--r--meson.build7
-rw-r--r--meson_options.txt2
-rw-r--r--tests/scanner/meson.build2
-rw-r--r--tools/meson.build4
4 files changed, 11 insertions, 4 deletions
diff --git a/meson.build b/meson.build
index 3759c12b..cd647b04 100644
--- a/meson.build
+++ b/meson.build
@@ -151,6 +151,13 @@ if with_cairo
cairo_gobject_dep = cc.find_library ('cairo-gobject')
endif
endif
+else
+ warning('Not building with cairo support, not all tests will be run')
+endif
+
+with_doctool = get_option('doctool')
+if not with_doctool
+ warning('Not building with doctool support, not all tests will be run')
endif
subdir('girepository')
diff --git a/meson_options.txt b/meson_options.txt
index f268607a..7757a3a1 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -3,7 +3,7 @@ option('cairo', type: 'boolean', value : false,
)
option('doctool', type: 'boolean', value : false,
- description: 'Install g-ir-doc-tool'
+ description: 'Install g-ir-doc-tool and run related tests'
)
option('glib-src-dir', type: 'string',
diff --git a/tests/scanner/meson.build b/tests/scanner/meson.build
index 28430a2c..ab5da15a 100644
--- a/tests/scanner/meson.build
+++ b/tests/scanner/meson.build
@@ -503,7 +503,7 @@ foreach gir : test_girs
)
endforeach
-if get_option('doctool') and glib_dep.type_name() == 'pkgconfig'
+if with_doctool and glib_dep.type_name() == 'pkgconfig'
foreach language : ['C', 'Python', 'Gjs']
regress_docs = custom_target(
'generate-docs-' + language,
diff --git a/tools/meson.build b/tools/meson.build
index 6d38361a..48f981b7 100644
--- a/tools/meson.build
+++ b/tools/meson.build
@@ -5,7 +5,7 @@ tools = [
['g-ir-scanner', 'scannermain', 'scanner_main'],
['g-ir-annotation-tool', 'annotationmain', 'annotation_main'],
]
-if get_option('doctool')
+if with_doctool
tools += [['g-ir-doc-tool', 'docmain', 'doc_main']]
endif
@@ -39,7 +39,7 @@ foreach tool : tools
endforeach
girscanner = tool_output[0]
-if get_option('doctool')
+if with_doctool
girdoctool = tool_output[-1]
endif