diff options
Diffstat (limited to 'mesonbuild')
| -rw-r--r-- | mesonbuild/cmake/traceparser.py | 1 | ||||
| -rw-r--r-- | mesonbuild/compilers/cuda.py | 3 | ||||
| -rw-r--r-- | mesonbuild/dependencies/cmake.py | 1 | ||||
| -rw-r--r-- | mesonbuild/interpreter/kwargs.py | 1 |
4 files changed, 4 insertions, 2 deletions
diff --git a/mesonbuild/cmake/traceparser.py b/mesonbuild/cmake/traceparser.py index a07082a..7909e13 100644 --- a/mesonbuild/cmake/traceparser.py +++ b/mesonbuild/cmake/traceparser.py @@ -388,6 +388,7 @@ class CMakeTraceParser: target.depends += [key] working_dir = None + def handle_working_dir(key: str, target: CMakeGeneratorTarget) -> None: nonlocal working_dir if working_dir is None: diff --git a/mesonbuild/compilers/cuda.py b/mesonbuild/compilers/cuda.py index 9662dbc..fc9d52a 100644 --- a/mesonbuild/compilers/cuda.py +++ b/mesonbuild/compilers/cuda.py @@ -259,10 +259,13 @@ class CudaCompiler(Compiler): def is_xcompiler_flag_isolated(flag: str) -> bool: return flag == '-Xcompiler' + def is_xcompiler_flag_glued(flag: str) -> bool: return flag.startswith('-Xcompiler=') + def is_xcompiler_flag(flag: str) -> bool: return is_xcompiler_flag_isolated(flag) or is_xcompiler_flag_glued(flag) + def get_xcompiler_val(flag: str, flagit: T.Iterator[str]) -> str: if is_xcompiler_flag_glued(flag): return flag[len('-Xcompiler='):] diff --git a/mesonbuild/dependencies/cmake.py b/mesonbuild/dependencies/cmake.py index c8eaf9e..09f7f14 100644 --- a/mesonbuild/dependencies/cmake.py +++ b/mesonbuild/dependencies/cmake.py @@ -482,7 +482,6 @@ class CMakeDependency(ExternalDependency): for tgt in partial_modules: mlog.debug(tgt) - incDirs = [x for x in self.traceparser.get_cmake_var('PACKAGE_INCLUDE_DIRS') if x] defs = [x for x in self.traceparser.get_cmake_var('PACKAGE_DEFINITIONS') if x] libs_raw = [x for x in self.traceparser.get_cmake_var('PACKAGE_LIBRARIES') if x] diff --git a/mesonbuild/interpreter/kwargs.py b/mesonbuild/interpreter/kwargs.py index b97fe05..dff9e12 100644 --- a/mesonbuild/interpreter/kwargs.py +++ b/mesonbuild/interpreter/kwargs.py @@ -252,7 +252,6 @@ class DependencyPkgConfigVar(TypedDict): define_variable: T.List[str] - class DependencyGetVariable(TypedDict): cmake: T.Optional[str] |