mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-12-23 00:36:51 +00:00
Code Issues 1 Projects Releases Wiki Activity

meson: Only look for Obj-C/C++ compilers on macOS/iOS

Browse source 
On Windows, MinGW-GCC Objective-C/C++ compilers can be in PATH and
mess up the build since they may not match the CPU family of the C/C++
compilers we are using.

Also require them on macOS/iOS, because they should always be present.

Fixes https://gitlab.freedesktop.org/gstreamer/gst-build/-/issues/88

Part-of: <https://gitlab.freedesktop.org/gstreamer/gst-plugins-bad/-/merge_requests/1488>
This commit is contained in:
Nirbheek Chauhan 2020-08-04 05:34:23 +05:30 committed by GStreamer Merge Bot
parent 6cf03b21f6
commit 2881f6d728
1 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
meson.build
View file

@ -33,8 +33,15 @@ plugins = []
cc = meson.get_compiler('c') cc = meson.get_compiler('c')
cxx = meson.get_compiler('cpp') cxx = meson.get_compiler('cpp')
host_system = host_machine.system()
have_objc = add_languages('objc', native: false, required: false) if host_system in ['ios', 'darwin']
have_objc = add_languages('objc', native: false)
have_objcpp = add_languages('objcpp', native: false)
else
have_objc = false
have_objcpp = false
endif
cdata = configuration_data() cdata = configuration_data()
@ -243,7 +250,6 @@ cdata.set_quoted('GST_PACKAGE_NAME', gst_package_name)
cdata.set_quoted('GST_PACKAGE_ORIGIN', get_option('package-origin')) cdata.set_quoted('GST_PACKAGE_ORIGIN', get_option('package-origin'))
# FIXME: This should be exposed as a configuration option # FIXME: This should be exposed as a configuration option
host_system = host_machine.system()
if host_system == 'linux' if host_system == 'linux'
cdata.set_quoted('DEFAULT_VIDEOSRC', 'v4l2src') cdata.set_quoted('DEFAULT_VIDEOSRC', 'v4l2src')
elif ['darwin', 'ios'].contains(host_system) elif ['darwin', 'ios'].contains(host_system)
@ -369,7 +375,6 @@ if ['darwin', 'ios'].contains(host_system)
# cdata.set('HAVE_VIDEOTOOLBOX_10_9_6', 1) # cdata.set('HAVE_VIDEOTOOLBOX_10_9_6', 1)
# endif # endif
endif endif
have_objcpp = add_languages('objcpp', native: false, required: false)
have_orcc = false have_orcc = false
orcc_args = [] orcc_args = []