aboutsummaryrefslogtreecommitdiff
path: root/environment.py
diff options
context:
space:
mode:
authorJussi Pakkanen <jpakkane@gmail.com>2012-12-30 02:06:51 +0200
committerJussi Pakkanen <jpakkane@gmail.com>2012-12-30 02:06:51 +0200
commitfbecb5378dda9851456411e5baeb83176e26a404 (patch)
tree13602369f0b9858bef53a92c7339292643908469 /environment.py
parent676dc51ac9324a7cb992eddc47ae94d941501c4a (diff)
downloadmeson-fbecb5378dda9851456411e5baeb83176e26a404.zip
meson-fbecb5378dda9851456411e5baeb83176e26a404.tar.gz
meson-fbecb5378dda9851456411e5baeb83176e26a404.tar.bz2
Can generate external dependency objects.
Diffstat (limited to 'environment.py')
-rwxr-xr-xenvironment.py8
1 files changed, 5 insertions, 3 deletions
diff --git a/environment.py b/environment.py
index ee1a952..45d0266 100755
--- a/environment.py
+++ b/environment.py
@@ -155,6 +155,7 @@ class Environment():
def get_object_suffix(self):
return self.object_suffix
+# This should be an InterpreterObject. Fix it.
class PkgConfigDependency():
pkgconfig_found = False
@@ -196,11 +197,12 @@ class PkgConfigDependency():
stderr=subprocess.PIPE)
(out, err) = p.communicate()
if p.returncode != 0:
- raise RuntimeError('Pkg-config not found.')
- print('Found pkg-config version %s\n', out.strip())
+ raise RuntimeError('Pkg-config executable not found.')
+ print('Found pkg-config version %s.' % out.decode().strip())
PkgConfigDependency.pkgconfig_found = True
-def find_external_dependency(self, name):
+# Fixme, move to environment.
+def find_external_dependency(name):
# Add detectors for non-pkg-config deps (e.g. Boost) etc here.
return PkgConfigDependency(name)