diff options
| author | Dylan Baker <dylan@pnwbakers.com> | 2020-12-04 17:01:45 -0800 |
|---|---|---|
| committer | Dylan Baker <dylan@pnwbakers.com> | 2021-01-04 12:20:58 -0800 |
| commit | e81acbd6069e8c1ae8e3be7bb83ddc239009d42d (patch) | |
| tree | b08545b2844650ed95e42ade00ecb1cd3fb85b88 /mesonbuild/cmake/executor.py | |
| parent | 71db6b04a31707674ad776be1cf22f667056d56b (diff) | |
| download | meson-e81acbd6069e8c1ae8e3be7bb83ddc239009d42d.tar.gz | |
Use a single coredata dictionary for options
This patches takes the options work to it's logical conclusion: A single
flat dictionary of OptionKey: UserOptions. This allows us to simplify a
large number of cases, as we don't need to check if an option is in this
dict or that one (or any of 5 or 6, actually).
Diffstat (limited to 'mesonbuild/cmake/executor.py')
| -rw-r--r-- | mesonbuild/cmake/executor.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mesonbuild/cmake/executor.py b/mesonbuild/cmake/executor.py index 21dfd356c..674b854c8 100644 --- a/mesonbuild/cmake/executor.py +++ b/mesonbuild/cmake/executor.py @@ -62,7 +62,7 @@ class CMakeExecutor: self.cmakebin = None return - self.prefix_paths = self.environment.coredata.builtins[OptionKey('cmake_prefix_path', machine=self.for_machine)].value + self.prefix_paths = self.environment.coredata.options[OptionKey('cmake_prefix_path', machine=self.for_machine)].value env_pref_path_raw = get_env_var( self.for_machine, self.environment.is_cross_build(), |