From c2bcc2711afabb7467d2d420bfc2c98d70eb078a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tim-Philipp=20M=C3=BCller?= Date: Fri, 9 Mar 2018 23:59:16 +0000 Subject: [PATCH] meson: fix build when msdk is not found --- sys/msdk/meson.build | 4 ++++ tests/check/meson.build | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/sys/msdk/meson.build b/sys/msdk/meson.build index 48852bdc33..2e075fe2c4 100644 --- a/sys/msdk/meson.build +++ b/sys/msdk/meson.build @@ -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 diff --git a/tests/check/meson.build b/tests/check/meson.build index 6a2fb95c72..9bfac48cab 100644 --- a/tests/check/meson.build +++ b/tests/check/meson.build @@ -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]],