diff options
author | Xavier Claessens <xavier.claessens@collabora.com> | 2023-06-02 08:55:46 -0400 |
---|---|---|
committer | Xavier Claessens <xclaesse@gmail.com> | 2023-09-22 15:50:26 -0400 |
commit | e9369be086dc8381cda91725fb2073c4daf29b91 (patch) | |
tree | 6b1b30ae43a6b1564c388930ab05d60f2a6c569b /mesonbuild | |
parent | 49e7e3b9ccba7f9b0a135188f892b37d4e52cafc (diff) | |
download | meson-e9369be086dc8381cda91725fb2073c4daf29b91.zip meson-e9369be086dc8381cda91725fb2073c4daf29b91.tar.gz meson-e9369be086dc8381cda91725fb2073c4daf29b91.tar.bz2 |
CMakeInterpreter: Remove useless arguments
Diffstat (limited to 'mesonbuild')
-rw-r--r-- | mesonbuild/cmake/interpreter.py | 6 | ||||
-rw-r--r-- | mesonbuild/interpreter/interpreter.py | 8 |
2 files changed, 5 insertions, 9 deletions
diff --git a/mesonbuild/cmake/interpreter.py b/mesonbuild/cmake/interpreter.py index 2f7cb69..8e9ea18 100644 --- a/mesonbuild/cmake/interpreter.py +++ b/mesonbuild/cmake/interpreter.py @@ -56,7 +56,6 @@ if T.TYPE_CHECKING: from .common import CMakeConfiguration, TargetOptions from .traceparser import CMakeGeneratorTarget from .._typing import ImmutableListProtocol - from ..build import Build from ..backend.backends import Backend from ..environment import Environment @@ -766,10 +765,9 @@ class ConverterCustomTarget: mlog.log(' -- depends: ', mlog.bold(str(self.depends))) class CMakeInterpreter: - def __init__(self, build: 'Build', subdir: Path, src_dir: Path, install_prefix: Path, env: 'Environment', backend: 'Backend'): - self.build = build + def __init__(self, subdir: Path, install_prefix: Path, env: 'Environment', backend: 'Backend'): self.subdir = subdir - self.src_dir = src_dir + self.src_dir = Path(env.get_source_dir(), subdir) self.build_dir_rel = subdir / '__CMake_build' self.build_dir = Path(env.get_build_dir()) / self.build_dir_rel self.install_prefix = install_prefix diff --git a/mesonbuild/interpreter/interpreter.py b/mesonbuild/interpreter/interpreter.py index e0c17e6..505099f 100644 --- a/mesonbuild/interpreter/interpreter.py +++ b/mesonbuild/interpreter/interpreter.py @@ -919,7 +919,6 @@ class Interpreter(InterpreterBase, HoldableObject): return self.disabled_subproject(subp_name, exception=e) raise e - subdir_abs = os.path.join(self.environment.get_source_dir(), subdir) os.makedirs(os.path.join(self.build.environment.get_build_dir(), subdir), exist_ok=True) self.global_args_frozen = True @@ -933,7 +932,7 @@ class Interpreter(InterpreterBase, HoldableObject): if method == 'meson': return self._do_subproject_meson(subp_name, subdir, default_options, kwargs) elif method == 'cmake': - return self._do_subproject_cmake(subp_name, subdir, subdir_abs, default_options, kwargs) + return self._do_subproject_cmake(subp_name, subdir, default_options, kwargs) else: raise mesonlib.MesonBugException(f'The method {method} is invalid for the subproject {subp_name}') # Invalid code is always an error @@ -998,18 +997,17 @@ class Interpreter(InterpreterBase, HoldableObject): self.build.subprojects[subp_name] = subi.project_version return self.subprojects[subp_name] - def _do_subproject_cmake(self, subp_name: str, subdir: str, subdir_abs: str, + def _do_subproject_cmake(self, subp_name: str, subdir: str, default_options: T.Dict[OptionKey, str], kwargs: kwtypes.DoSubproject) -> SubprojectHolder: from ..cmake import CMakeInterpreter with mlog.nested(subp_name): - new_build = self.build.copy() prefix = self.coredata.options[OptionKey('prefix')].value from ..modules.cmake import CMakeSubprojectOptions options = kwargs.get('options') or CMakeSubprojectOptions() cmake_options = kwargs.get('cmake_options', []) + options.cmake_options - cm_int = CMakeInterpreter(new_build, Path(subdir), Path(subdir_abs), Path(prefix), new_build.environment, self.backend) + cm_int = CMakeInterpreter(Path(subdir), Path(prefix), self.build.environment, self.backend) cm_int.initialise(cmake_options) cm_int.analyse() |