meson: make C++ compiler optional

It's only used to build tests to see if our headers are C++ clean.
This commit is contained in:
Tim-Philipp Müller 2017-05-21 09:02:54 +01:00
parent ce439995c0
commit fe5111e71d
3 changed files with 10 additions and 4 deletions

2
common

@ -1 +1 @@
Subproject commit 29046b89d80bbca22eb222c18820fb40a4ac5bde Subproject commit 48a5d85ebf4a0bad1c997c83100f710fe2154fbf

View file

@ -1,4 +1,4 @@
project('gstreamer', 'c', 'cpp', project('gstreamer', 'c',
version : '1.13.0.1', version : '1.13.0.1',
meson_version : '>= 0.40.1', meson_version : '>= 0.40.1',
default_options : [ 'warning_level=1', default_options : [ 'warning_level=1',

View file

@ -105,10 +105,16 @@ core_tests = [
[ 'gst/gstevent.c', not have_registry ], [ 'gst/gstevent.c', not have_registry ],
[ 'pipelines/stress.c', not have_registry ], [ 'pipelines/stress.c', not have_registry ],
[ 'generic/sinks.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 = [ test_defines = [
'-UG_DISABLE_ASSERT', '-UG_DISABLE_ASSERT',
'-UG_DISABLE_CAST_CHECKS', '-UG_DISABLE_CAST_CHECKS',