[cairo-commit] 2 commits - boilerplate/meson.build util/cairo-missing

[GitLab Mirror]

 boilerplate/meson.build        |    2 ++
 util/cairo-missing/meson.build |    2 ++
 2 files changed, 4 insertions(+)

New commits:
commit f0fb05f3a11e8ef949118676460ad4805b2f8ad6
Merge: 974791b4e 51d50621b
Author: Uli Schlachter <psychon at znc.in>
Date:   Sat Jan 16 11:37:21 2021 +0000

    Merge branch 'meson-only-build-helper-libs-if-needed' into 'master'
    
    meson: only build cairo-boilerplate and cairo-missing helper libs if needed
    
    See merge request cairo/cairo!110

commit 51d50621be80131334d6966d5c08bb5f635882ac
Author: Tim-Philipp Müller <tim at centricular.com>
Date:   Fri Jan 15 18:47:08 2021 +0000

    meson: only build cairo-boilerplate and cairo-missing helper libs if needed
    
    Used by tests and the sphinx utility, which may or may not be built,
    and if they're not built we don't need to build those libs either.

diff --git a/boilerplate/meson.build b/boilerplate/meson.build
index 325396d6e..79d1eeea4 100644
--- a/boilerplate/meson.build
+++ b/boilerplate/meson.build
@@ -40,4 +40,6 @@ libcairoboilerplate = static_library('cairoboilerplate', cairo_boilerplate_sourc
   include_directories: [incbase, incsrc],
   dependencies: deps,
   link_with: [libcairo],
+  install: false,
+  build_by_default: false,
 )
diff --git a/util/cairo-missing/meson.build b/util/cairo-missing/meson.build
index db328fb1c..dd1507b59 100644
--- a/util/cairo-missing/meson.build
+++ b/util/cairo-missing/meson.build
@@ -8,4 +8,6 @@ inccairomissing = include_directories('.')
 libcairomissing = static_library('cairo-missing', cairo_missing_sources,
   c_args: ['-DHAVE_CONFIG_H'],
   include_directories: [incbase, incsrc],
+  install: false,
+  build_by_default: false,
 )