diff options
| author | Jussi Pakkanen <jpakkane@gmail.com> | 2024-06-08 23:16:36 +0300 |
|---|---|---|
| committer | Jussi Pakkanen <jpakkane@gmail.com> | 2024-06-14 17:19:53 +0300 |
| commit | c0d86024f5e647858f88bc400b45b3ad88a25c97 (patch) | |
| tree | b6384fe1f810a32c5276bf4bd8b8c641505d8157 /mesonbuild/cmake | |
| parent | 2b1510d7068747541f8d49ba876570d62fde5d0e (diff) | |
| download | meson-c0d86024f5e647858f88bc400b45b3ad88a25c97.tar.gz | |
Rename option variable to optstore to make it unique.
Diffstat (limited to 'mesonbuild/cmake')
| -rw-r--r-- | mesonbuild/cmake/common.py | 4 | ||||
| -rw-r--r-- | mesonbuild/cmake/executor.py | 2 | ||||
| -rw-r--r-- | mesonbuild/cmake/interpreter.py | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/mesonbuild/cmake/common.py b/mesonbuild/cmake/common.py index f117a9f6b..02648195d 100644 --- a/mesonbuild/cmake/common.py +++ b/mesonbuild/cmake/common.py @@ -51,9 +51,9 @@ blacklist_cmake_defs = [ ] def cmake_is_debug(env: 'Environment') -> bool: - if OptionKey('b_vscrt') in env.coredata.options: + if OptionKey('b_vscrt') in env.coredata.optstore: is_debug = env.coredata.get_option(OptionKey('buildtype')) == 'debug' - if env.coredata.options[OptionKey('b_vscrt')].value in {'mdd', 'mtd'}: + if env.coredata.optstore[OptionKey('b_vscrt')].value in {'mdd', 'mtd'}: is_debug = True return is_debug else: diff --git a/mesonbuild/cmake/executor.py b/mesonbuild/cmake/executor.py index dd43cc04a..a8850d6fe 100644 --- a/mesonbuild/cmake/executor.py +++ b/mesonbuild/cmake/executor.py @@ -51,7 +51,7 @@ class CMakeExecutor: self.cmakebin = None return - self.prefix_paths = self.environment.coredata.options[OptionKey('cmake_prefix_path', machine=self.for_machine)].value + self.prefix_paths = self.environment.coredata.optstore[OptionKey('cmake_prefix_path', machine=self.for_machine)].value if self.prefix_paths: self.extra_cmake_args += ['-DCMAKE_PREFIX_PATH={}'.format(';'.join(self.prefix_paths))] diff --git a/mesonbuild/cmake/interpreter.py b/mesonbuild/cmake/interpreter.py index 4c42dbb09..57354d32c 100644 --- a/mesonbuild/cmake/interpreter.py +++ b/mesonbuild/cmake/interpreter.py @@ -532,7 +532,7 @@ class ConverterTarget: @lru_cache(maxsize=None) def _all_lang_stds(self, lang: str) -> 'ImmutableListProtocol[str]': try: - res = self.env.coredata.options[OptionKey('std', machine=MachineChoice.BUILD, lang=lang)].choices + res = self.env.coredata.optstore[OptionKey('std', machine=MachineChoice.BUILD, lang=lang)].choices except KeyError: return [] |