diff options
author | Jussi Pakkanen <jpakkane@gmail.com> | 2015-08-25 01:43:04 +0300 |
---|---|---|
committer | Jussi Pakkanen <jpakkane@gmail.com> | 2015-08-25 01:43:04 +0300 |
commit | c19570654cf8d7c00d8b8d96bb8d3f3cf0e68d1e (patch) | |
tree | 3e30bc59c19e93a40095eeefa6c6000f8faf31b5 | |
parent | cd97f7a768fafc3ff9372e2559df1850c9ab7898 (diff) | |
download | meson-c19570654cf8d7c00d8b8d96bb8d3f3cf0e68d1e.zip meson-c19570654cf8d7c00d8b8d96bb8d3f3cf0e68d1e.tar.gz meson-c19570654cf8d7c00d8b8d96bb8d3f3cf0e68d1e.tar.bz2 |
Expose project version properly.
-rw-r--r-- | interpreter.py | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/interpreter.py b/interpreter.py index f5b81a4..5e8effc 100644 --- a/interpreter.py +++ b/interpreter.py @@ -699,7 +699,7 @@ class ModuleHolder(InterpreterObject): state.subdir = self.interpreter.subdir state.environment = self.interpreter.environment state.project_name = self.interpreter.build.project_name - state.project_version = self.interpreter.build.project_version + state.project_version = self.interpreter.build.dep_manifest[self.interpreter.active_projectname] state.compilers = self.interpreter.build.compilers state.targets = self.interpreter.build.targets state.headers = self.interpreter.build.get_headers() @@ -1168,7 +1168,6 @@ class Interpreter(): raise InterpreterException('Recursive include of subprojects: %s.' % incpath) if dirname in self.subprojects: return self.subprojects[dirname] - subdir = os.path.join(self.subproject_dir, dirname) r = wrap.Resolver(os.path.join(self.build.environment.get_source_dir(), self.subproject_dir)) resolved = r.resolve(dirname) if resolved is None: |