From f8556f1a08eb9f1aea34c1aca8b1fc6900ed3211 Mon Sep 17 00:00:00 2001 From: Wim Taymans Date: Tue, 8 Jan 2019 12:18:45 +0100 Subject: [PATCH] make c++ optional --- meson.build | 4 +++- spa/tests/auto/meson.build | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/meson.build b/meson.build index 054813140..0c5fde8de 100644 --- a/meson.build +++ b/meson.build @@ -1,4 +1,4 @@ -project('pipewire', ['c', 'cpp' ], +project('pipewire', ['c' ], version : '0.2.9', license : 'MIT', meson_version : '>= 0.42.0', @@ -37,6 +37,8 @@ spa_plugindir = join_paths(pipewire_libdir, 'spa') gnome = import('gnome') pkgconfig = import('pkgconfig') +have_cpp = add_languages('cpp', required : false) + cc = meson.get_compiler('c') if cc.get_id() == 'gcc' diff --git a/spa/tests/auto/meson.build b/spa/tests/auto/meson.build index 2f544c073..be8ae0289 100644 --- a/spa/tests/auto/meson.build +++ b/spa/tests/auto/meson.build @@ -6,11 +6,13 @@ test_utils = executable('test-utils', 'test-utils.c', include_directories : [spa_inc ], dependencies : [], install : false) +if have_cpp test_cpp = executable('test-cpp', 'test-cpp.cpp', include_directories : [spa_inc ], dependencies : [], install : false) +test('test-cpp', test_cpp) +endif test('test-buffer', test_buffer) test('test-utils', test_utils) -test('test-cpp', test_cpp)