diff options
| author | Jussi Pakkanen <jpakkane@gmail.com> | 2024-04-14 12:58:30 +0300 |
|---|---|---|
| committer | Jussi Pakkanen <jpakkane@gmail.com> | 2025-02-13 15:26:44 +0200 |
| commit | 518c732ea9b0f1975f6f28accff3286be4106538 (patch) | |
| tree | 2be9544828545a2f9f0676efc6eb82ac197ec4bd /mesonbuild/cmake/executor.py | |
| parent | ea678ed82938ceac00682b2695b57193d36b71b4 (diff) | |
| download | meson-optionrefactor3.zip meson-optionrefactor3.tar.gz meson-optionrefactor3.tar.bz2 | |
Make all Meson level options overridable per subproject.optionrefactor3
Diffstat (limited to 'mesonbuild/cmake/executor.py')
| -rw-r--r-- | mesonbuild/cmake/executor.py | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/mesonbuild/cmake/executor.py b/mesonbuild/cmake/executor.py index cbe75f3..0c704f9 100644 --- a/mesonbuild/cmake/executor.py +++ b/mesonbuild/cmake/executor.py @@ -11,7 +11,6 @@ import os from .. import mlog from ..mesonlib import PerMachine, Popen_safe, version_compare, is_windows -from ..options import OptionKey from ..programs import find_external_program, NonExistingExternalProgram if T.TYPE_CHECKING: @@ -52,7 +51,9 @@ class CMakeExecutor: self.cmakebin = None return - self.prefix_paths = self.environment.coredata.optstore.get_value(OptionKey('cmake_prefix_path', machine=self.for_machine)) + prefpath = self.environment.coredata.optstore.get_value_for('cmake_prefix_path') + assert isinstance(prefpath, list) + self.prefix_paths = prefpath if self.prefix_paths: self.extra_cmake_args += ['-DCMAKE_PREFIX_PATH={}'.format(';'.join(self.prefix_paths))] |