mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-11-28 12:41:05 +00:00
Code Issues 1 Projects Releases Wiki Activity

meson: Make C++ compiler detection not be automagic

Browse source 
It is now controlled by the qt5 and/or taglib options. We won't
silently fail to build taglib now.

Part-of: <https://gitlab.freedesktop.org/gstreamer/gst-plugins-good/-/merge_requests/587>
This commit is contained in:
Nirbheek Chauhan 2020-05-12 04:33:43 +05:30
parent d67a658daf
commit 553ac050f0
3 changed files with 2 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
ext/qt/meson.build
View file

@ -33,10 +33,7 @@ if not have_gstgl
subdir_done() subdir_done()
endif endif
if not have_cxx if not add_languages('cpp', required: qt5_option)
if qt5_option.enabled()
error('qt5 qmlglsink plugin is enabled, but no C++ compiler is available')
endif
subdir_done() subdir_done()
endif endif

2
ext/taglib/meson.build
View file

@ -6,7 +6,7 @@ taglib_sources = [
taglib_dep = dependency('taglib', version : '>= 1.5', required : get_option('taglib')) taglib_dep = dependency('taglib', version : '>= 1.5', required : get_option('taglib'))
if taglib_dep.found() and add_languages('cpp') if taglib_dep.found() and add_languages('cpp', required : get_option('taglib'))
extra_args = [] extra_args = []
cxx = meson.get_compiler('cpp') cxx = meson.get_compiler('cpp')
if cxx.has_argument('-fvisibility=hidden') if cxx.has_argument('-fvisibility=hidden')

1
meson.build
View file

@ -16,7 +16,6 @@ else
endif endif
gst_version_is_dev = gst_version_minor % 2 == 1 and gst_version_micro < 90 gst_version_is_dev = gst_version_minor % 2 == 1 and gst_version_micro < 90
# FIXME: automagic
have_cxx = add_languages('cpp', required : false) have_cxx = add_languages('cpp', required : false)
glib_req = '>= 2.44.0' glib_req = '>= 2.44.0'