From: Steinar H. Gunderson <sgunderson@bigfoot.com>
Date: Thu, 20 Dec 2018 15:52:41 +0000 (+0100)
Subject: Use get_pkgconfig_variable() instead of calling pkg-config manually.
X-Git-Tag: 1.8.1~60
X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=1c8c62666642be6b4ffd397c13e66f4cbaf5e38c;hp=1bd72e916cfd0afc2df6a9f61535ccf77090d0b4;p=nageru

Use get_pkgconfig_variable() instead of calling pkg-config manually.
---

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')