From da23630a97a2999faef42a68a631105a3556054c Mon Sep 17 00:00:00 2001 From: Eli Schwartz Date: Sun, 20 Nov 2022 17:26:44 -0500 Subject: refactor pkg-config dependency to allow statically finding the program The pkg-config dependency class has some interesting logic for finding a good pkg-config that will be used for dependency lookups. We sometimes need to use it, though, outside of the class. Make that possible. --- unittests/linuxliketests.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'unittests') diff --git a/unittests/linuxliketests.py b/unittests/linuxliketests.py index 1e530b0..50c6b62 100644 --- a/unittests/linuxliketests.py +++ b/unittests/linuxliketests.py @@ -173,7 +173,7 @@ class LinuxlikeTests(BasePlatformTests): self.assertEqual(libhello_nolib.get_compile_args(), []) self.assertEqual(libhello_nolib.get_pkgconfig_variable('foo', [], None), 'bar') self.assertEqual(libhello_nolib.get_pkgconfig_variable('prefix', [], None), self.prefix) - if version_compare(libhello_nolib.check_pkgconfig(libhello_nolib.pkgbin),">=0.29.1"): + if version_compare(PkgConfigDependency.check_pkgconfig(env, libhello_nolib.pkgbin),">=0.29.1"): self.assertEqual(libhello_nolib.get_pkgconfig_variable('escaped_var', [], None), r'hello\ world') self.assertEqual(libhello_nolib.get_pkgconfig_variable('unescaped_var', [], None), 'hello world') -- cgit v1.1