diff options
| author | Daniel Mensinger <daniel@mensinger-ka.de> | 2019-06-07 15:54:07 +0200 |
|---|---|---|
| committer | Daniel Mensinger <daniel@mensinger-ka.de> | 2019-06-12 13:58:20 +0200 |
| commit | b1cf0fd3806d9b159a3c6cc6b1bd2ef4d14a6021 (patch) | |
| tree | b3b05ec2942b9ef4144a1eb6d69b69ea19d9bd97 /mesonbuild/dependencies/dev.py | |
| parent | 6083cfa6c8f138102a1901ceb88c74615aa3fa01 (diff) | |
| download | meson-b1cf0fd3806d9b159a3c6cc6b1bd2ef4d14a6021.zip meson-b1cf0fd3806d9b159a3c6cc6b1bd2ef4d14a6021.tar.gz meson-b1cf0fd3806d9b159a3c6cc6b1bd2ef4d14a6021.tar.bz2 | |
cmake: Move parsing the CMake trace into the CMake module
Diffstat (limited to 'mesonbuild/dependencies/dev.py')
| -rw-r--r-- | mesonbuild/dependencies/dev.py | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/mesonbuild/dependencies/dev.py b/mesonbuild/dependencies/dev.py index 5fd547b..f7b107c 100644 --- a/mesonbuild/dependencies/dev.py +++ b/mesonbuild/dependencies/dev.py @@ -418,8 +418,8 @@ class LLVMDependencyCMake(CMakeDependency): super().__init__(name='LLVM', environment=env, language='cpp', kwargs=kwargs) # Extract extra include directories and definitions - inc_dirs = self.get_cmake_var('PACKAGE_INCLUDE_DIRS') - defs = self.get_cmake_var('PACKAGE_DEFINITIONS') + inc_dirs = self.traceparser.get_cmake_var('PACKAGE_INCLUDE_DIRS') + defs = self.traceparser.get_cmake_var('PACKAGE_DEFINITIONS') temp = ['-I' + x for x in inc_dirs] + defs self.compile_args += [x for x in temp if x not in self.compile_args] self._add_sub_dependency(ThreadDependency, env, kwargs) @@ -434,7 +434,7 @@ class LLVMDependencyCMake(CMakeDependency): def _map_module_list(self, modules: List[Tuple[str, bool]]) -> List[Tuple[str, bool]]: res = [] for mod, required in modules: - cm_targets = self.get_cmake_var('MESON_LLVM_TARGETS_{}'.format(mod)) + cm_targets = self.traceparser.get_cmake_var('MESON_LLVM_TARGETS_{}'.format(mod)) if not cm_targets: if required: raise self._gen_exception('LLVM module {} was not found'.format(mod)) @@ -446,7 +446,7 @@ class LLVMDependencyCMake(CMakeDependency): return res def _original_module_name(self, module: str) -> str: - orig_name = self.get_cmake_var('MESON_TARGET_TO_LLVM_{}'.format(module)) + orig_name = self.traceparser.get_cmake_var('MESON_TARGET_TO_LLVM_{}'.format(module)) if orig_name: return orig_name[0] return module |