diff options
| author | Jochen Henneberg <jh@henneberg-systemdesign.com> | 2019-11-05 13:46:59 +0100 |
|---|---|---|
| committer | GStreamer Merge Bot <gitlab-merge-bot@gstreamer-foundation.org> | 2019-11-17 17:39:44 +0000 |
| commit | 3ecd8666d94526f15b4bf569c3280ca87bcc6505 (patch) | |
| tree | 54780fbbbda873e9dd22efac70f166824dd3efb4 /sys/msdk/meson.build | |
| parent | 1569c33f248ecf33c86d14fbe52f35c037e0e933 (diff) | |
| download | gstreamer-plugins-bad-3ecd8666d94526f15b4bf569c3280ca87bcc6505.tar.gz | |
msdk: Fixes for meson include directory setup
In case of pkg-config we need to create the include directories object
from the path using include_directories(). For INTELMEDIASDKROOT or
MFX_HOME we need to add the alternate include path ./include/mfx as
Intel MediaSDK now puts the headers there.
Diffstat (limited to 'sys/msdk/meson.build')
| -rw-r--r-- | sys/msdk/meson.build | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/sys/msdk/meson.build b/sys/msdk/meson.build index c52155413..1618f6694 100644 --- a/sys/msdk/meson.build +++ b/sys/msdk/meson.build @@ -42,6 +42,7 @@ endif mfx_dep = dependency('libmfx', required: false) if mfx_dep.found() mfx_incdir = mfx_dep.get_pkgconfig_variable('includedir') + mfx_inc = [] else # Old versions of MediaSDK don't provide a pkg-config file mfx_root = run_command(python3, '-c', 'import os; print(os.environ.get("INTELMEDIASDKROOT", os.environ.get("MFX_HOME", "")))').stdout().strip() @@ -69,6 +70,7 @@ endif # Old versions of MediaSDK don't have the 'mfx' directory prefix if cxx.has_header('mfx/mfxdefs.h', args: '-I' + mfx_incdir) mfx_incdir = join_paths([mfx_incdir, 'mfx']) + mfx_inc = include_directories(mfx_incdir) endif if cxx.has_header('mfxvp9.h', args: '-I' + mfx_incdir) @@ -96,7 +98,7 @@ if msdk_deps_found gstmsdktag = library('gstmsdk', msdk_sources, c_args : gst_plugins_bad_args, - include_directories : [configinc, mfx_incdir], + include_directories : [configinc, mfx_inc], dependencies : [gstbase_dep, gstvideo_dep, gstpbutils_dep, gstallocators_dep, mfx_dep, msdk_deps], install : true, install_dir : plugins_install_dir, |