From fe5111e71df96bbb65db4ff2f1654e5636006f7b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tim-Philipp=20M=C3=BCller?= Date: Sun, 21 May 2017 09:02:54 +0100 Subject: [PATCH] meson: make C++ compiler optional It's only used to build tests to see if our headers are C++ clean. --- common | 2 +- meson.build | 2 +- tests/check/meson.build | 10 ++++++++-- 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/common b/common index 29046b89d8..48a5d85ebf 160000 --- a/common +++ b/common @@ -1 +1 @@ -Subproject commit 29046b89d80bbca22eb222c18820fb40a4ac5bde +Subproject commit 48a5d85ebf4a0bad1c997c83100f710fe2154fbf diff --git a/meson.build b/meson.build index 884b36ea29..83c34cc71f 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 47faa265eb..2d11e0a74e 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',