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

meson: Only ensure that moc is available on Linux

Browse source 
On other OSes, it's not possible to have qmake or the qt5 pkg-config
files and not have moc, and `moc` will not be in `PATH`, so this only
causes problems.
This commit is contained in:
Nirbheek Chauhan 2019-04-01 18:20:28 +05:30
parent 915a9c99bb
commit f23724b8a6
1 changed files with 12 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
ext/qt/meson.build
View file

@ -20,8 +20,18 @@ if have_cxx and build_gstgl
qt5qml_dep = dependency('qt5', modules : ['Core', 'Gui', 'Qml', 'Quick'],
required: get_option('qt5'), static: host_machine.system() == 'ios')
# FIXME Add a way to get that information out of the qt5 module
moc = find_program('moc-qt5', 'moc', required : get_option('qt5'))
# On Linux, distros often have the Qt5 pkg-config files and moc in separate
# packages, so the user may not have both installed. Check for moc and ensure
# that it's installed.
# We don't do this check on other OSes because they need to be able to simply
# point the `QMAKE` env var to `qmake` to build against a particular Qt5.
if host_system == 'linux'
moc = find_program('moc-qt5', 'moc', required : get_option('qt5'))
else
# We only check if `moc` was found, and then discard it, so we can fake it.
# This is also a good unit test of the fact that we *don't* use it.
moc = declare_dependency()
endif
if qt5qml_dep.found() and moc.found()
optional_deps = []
qt_defines = []