From d37d649b08b832d52fa684bc0506829fb40d5261 Mon Sep 17 00:00:00 2001
From: Jussi Pakkanen <jpakkane@gmail.com>
Date: Sun, 14 Apr 2024 12:58:30 +0300
Subject: Make all Meson level options overridable per subproject.

---
 mesonbuild/cmake/executor.py | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'mesonbuild/cmake/executor.py')

diff --git a/mesonbuild/cmake/executor.py b/mesonbuild/cmake/executor.py
index cbe75f36c..0c704f94a 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))]
 
-- 
cgit v1.2.3