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

meson: fix build when msdk is not found

Browse source
This commit is contained in:
Tim-Philipp Müller 2018-03-09 23:59:16 +00:00
parent 1192a598ee
commit c2bcc2711a
2 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
sys/msdk/meson.build
View file

@ -30,6 +30,9 @@ endif
msdk_root = run_command(python3, '-c', 'import os; print(os.environ.get("INTELMEDIASDKROOT", os.environ.get("MFX_HOME", "")))').stdout().strip()
have_msdk = false
msdk_dep = []
if msdk_root != ''
msdk_libdir = [msdk_root + '/lib/lin_x64', msdk_root + '/lib/x64']
msdk_incdir = include_directories(msdk_root + '/include')
@ -56,5 +59,6 @@ if msdk_root != ''
install : true,
install_dir : plugins_install_dir,
)
have_msdk = true
endif
endif

2
tests/check/meson.build
View file

@ -56,7 +56,7 @@ base_tests = [
[['elements/webrtcbin.c'], not libnice_dep.found(), [gstwebrtc_dep]],
[['elements/x265enc.c'], not x265_dep.found(), [x265_dep]],
[['elements/zbar.c'], not zbar_dep.found(), [zbar_dep]],
[['elements/msdkh264enc.c'], not msdk_dep.found(), [msdk_dep]],
[['elements/msdkh264enc.c'], not have_msdk, [msdk_dep]],
[['libs/h264parser.c'], false, [gstcodecparsers_dep]],
[['libs/h265parser.c'], false, [gstcodecparsers_dep]],
[['libs/insertbin.c'], false, [gstinsertbin_dep]],