pixman: Branch 'master'

[GitLab Mirror]

 meson.build       |    7 +++++--
 meson_options.txt |    5 +++++
 2 files changed, 10 insertions(+), 2 deletions(-)

New commits:
commit 606f5c15b0e7959087e1a22c8d9f594afaf1ead0
Author: Tim-Philipp Müller <tim at centricular.com>
Date:   Sat May 30 11:42:22 2020 +0100

    meson: add option to skip building of tests and demos
    
    Reviewed-by: Dylan Baker <dylan at pnwbakers.com>

diff --git a/meson.build b/meson.build
index 91d6578..72ad8b9 100644
--- a/meson.build
+++ b/meson.build
@@ -534,8 +534,11 @@ version_conf.set('PIXMAN_VERSION_MICRO', split[2])
 add_project_arguments('-DHAVE_CONFIG_H', language : ['c'])
 
 subdir('pixman')
-subdir('test')
-subdir('demos')
+
+if not get_option('tests').disabled()
+  subdir('test')
+  subdir('demos')
+endif
 
 pkg = import('pkgconfig')
 pkg.generate(
diff --git a/meson_options.txt b/meson_options.txt
index 008701b..355a8f5 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -106,3 +106,8 @@ option(
   type : 'feature',
   description : 'Use libpng'
 )
+option(
+  'tests',
+  type : 'feature',
+  description : 'Build tests and demos'
+)