From 1c8c62666642be6b4ffd397c13e66f4cbaf5e38c Mon Sep 17 00:00:00 2001 From: "Steinar H. Gunderson" Date: Thu, 20 Dec 2018 16:52:41 +0100 Subject: [PATCH] Use get_pkgconfig_variable() instead of calling pkg-config manually. --- meson.build | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/meson.build b/meson.build index 16a604e..7214f27 100644 --- a/meson.build +++ b/meson.build @@ -41,11 +41,8 @@ if cxx.links(code, args: '-fuse-ld=lld', name: 'check for LLD') endif # Add the right MOVIT_SHADER_DIR definition. -r = run_command('pkg-config', '--variable=shaderdir', 'movit') -if r.returncode() != 0 - error('Movit pkg-config installation is broken.') -endif -add_project_arguments('-DMOVIT_SHADER_DIR="' + r.stdout().strip() + '"', language: 'cpp') +movit_shader_dir = movitdep.get_pkgconfig_variable('shaderdir') +add_project_arguments('-DMOVIT_SHADER_DIR="' + movit_shader_dir + '"', language: 'cpp') # Make the Nageru version available as a #define. add_project_arguments('-DNAGERU_VERSION="' + meson.project_version() + '"', language: 'cpp') -- 2.39.2