diff options
author | Daniel Mensinger <daniel@mensinger-ka.de> | 2019-04-12 13:08:47 +0200 |
---|---|---|
committer | Daniel Mensinger <daniel@mensinger-ka.de> | 2019-05-03 01:39:16 +0200 |
commit | 1fba945b61619a344c21468eb2bb36604f1cb975 (patch) | |
tree | 5aaa40ffaa9f3504f44a4c68110a45023d9dbfc9 /mesonbuild/dependencies/base.py | |
parent | 3f539e01aedd1a3498c341efadb591a8a90e6995 (diff) | |
download | meson-1fba945b61619a344c21468eb2bb36604f1cb975.zip meson-1fba945b61619a344c21468eb2bb36604f1cb975.tar.gz meson-1fba945b61619a344c21468eb2bb36604f1cb975.tar.bz2 |
cmake: LLVM better modules handling
Diffstat (limited to 'mesonbuild/dependencies/base.py')
-rw-r--r-- | mesonbuild/dependencies/base.py | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/mesonbuild/dependencies/base.py b/mesonbuild/dependencies/base.py index 486f523..8f38d6c 100644 --- a/mesonbuild/dependencies/base.py +++ b/mesonbuild/dependencies/base.py @@ -1462,7 +1462,7 @@ class CMakeDependency(ExternalDependency): self.compile_args = compileOptions + compileDefinitions + list(map(lambda x: '-I{}'.format(x), incDirs)) self.link_args = libraries - def get_first_cmake_var_of(self, var_list): + def get_first_cmake_var_of(self, var_list: List[str]) -> List[str]: # Return the first found CMake variable in list var_list for i in var_list: if i in self.vars: @@ -1470,7 +1470,7 @@ class CMakeDependency(ExternalDependency): return [] - def get_cmake_var(self, var): + def get_cmake_var(self, var: str) -> List[str]: # Return the value of the CMake variable var or an empty list if var does not exist if var in self.vars: return self.vars[var] @@ -1779,6 +1779,7 @@ set(CMAKE_SIZEOF_VOID_P "{}") def log_details(self) -> str: modules = [self._original_module_name(x) for x in self.found_modules] + modules = sorted(set(modules)) if modules: return 'modules: ' + ', '.join(modules) return '' |