diff options
author | Sam Thursfield <sam@afuera.me.uk> | 2020-10-16 10:47:35 +0000 |
---|---|---|
committer | Sam Thursfield <sam@afuera.me.uk> | 2020-10-16 10:47:35 +0000 |
commit | bb2bed9fbb3a808c2f3bdb097cd632be8e29b4a1 (patch) | |
tree | 258093eaef325cab716d66d11e2dc8b3dcb0c027 | |
parent | 44f29f53f9bbb99c2e1cab4d3970b81a41867608 (diff) | |
parent | c7dd66e8bd4bb966c7e53480b9e485f2bb42b6ce (diff) | |
download | libmediaart-bb2bed9fbb3a808c2f3bdb097cd632be8e29b4a1.tar.gz |
Merge branch 'master' into 'master'
meson.build: don't require C++
See merge request GNOME/libmediaart!3
-rw-r--r-- | libmediaart/meson.build | 1 | ||||
-rw-r--r-- | meson.build | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/libmediaart/meson.build b/libmediaart/meson.build index 4f15513..20f0942 100644 --- a/libmediaart/meson.build +++ b/libmediaart/meson.build @@ -18,6 +18,7 @@ libmediaart_sources = [ if image_library_name == 'gdk-pixbuf-2.0' libmediaart_sources += 'extractpixbuf.c' elif image_library_name == 'QtGui' or image_library_name == 'Qt5Gui' + add_languages('cpp', required : true) libmediaart_sources += 'extractqt.cpp' else libmediaart_sources += 'extractdummy.c' diff --git a/meson.build b/meson.build index 741480d..f4196f4 100644 --- a/meson.build +++ b/meson.build @@ -1,4 +1,4 @@ -project('libmediaart', 'c', 'cpp', +project('libmediaart', 'c', version: '1.9.4', default_options: [ 'warning_level=1' ]) |