summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim-Philipp Müller <tim@centricular.com>2017-05-21 09:02:54 +0100
committerTim-Philipp Müller <tim@centricular.com>2017-05-21 09:02:54 +0100
commitfe5111e71df96bbb65db4ff2f1654e5636006f7b (patch)
treeb305555500ef0cf4aea8f470091630389b1d72de
parentce439995c006b493ba0073c9dfbfe07422a5acda (diff)
meson: make C++ compiler optionalHEADmaster
It's only used to build tests to see if our headers are C++ clean.
m---------common0
-rw-r--r--meson.build2
-rw-r--r--tests/check/meson.build10
3 files changed, 9 insertions, 3 deletions
diff --git a/common b/common
-Subproject 29046b89d80bbca22eb222c18820fb40a4ac5bd
+Subproject 48a5d85ebf4a0bad1c997c83100f710fe2154fb
diff --git a/meson.build b/meson.build
index 884b36ea2..83c34cc71 100644
--- a/meson.build
+++ b/meson.build
@@ -1,4 +1,4 @@
-project('gstreamer', 'c', 'cpp',
+project('gstreamer', 'c',
version : '1.13.0.1',
meson_version : '>= 0.40.1',
default_options : [ 'warning_level=1',
diff --git a/tests/check/meson.build b/tests/check/meson.build
index 47faa265e..2d11e0a74 100644
--- a/tests/check/meson.build
+++ b/tests/check/meson.build
@@ -105,10 +105,16 @@ core_tests = [
[ 'gst/gstevent.c', not have_registry ],
[ 'pipelines/stress.c', not have_registry ],
[ 'generic/sinks.c', not have_registry ],
- [ 'gst/gstcpp.cc', not have_registry ],
- [ 'libs/gstlibscpp.cc', false ],
]
+# Make sure our headers are C++ clean
+if add_languages('cpp', required : false)
+ core_tests += [
+ [ 'gst/gstcpp.cc', not have_registry ],
+ [ 'libs/gstlibscpp.cc', false ],
+ ]
+endif
+
test_defines = [
'-UG_DISABLE_ASSERT',
'-UG_DISABLE_CAST_CHECKS',