aboutsummaryrefslogtreecommitdiff
path: root/mesonbuild/dependencies
diff options
context:
space:
mode:
authorDaniel Mensinger <daniel@mensinger-ka.de>2021-12-18 14:04:08 +0100
committerDaniel Mensinger <daniel@mensinger-ka.de>2022-01-23 13:22:59 +0100
commit42843c4cf6d8e9013ebbf0f77dea7b33bb1ff328 (patch)
tree49be850bac008cd0a488e7f19956857a2a1a8d4f /mesonbuild/dependencies
parent99aae9b4dfc7f1ab6469adee718d54d9afd45097 (diff)
downloadmeson-42843c4cf6d8e9013ebbf0f77dea7b33bb1ff328.zip
meson-42843c4cf6d8e9013ebbf0f77dea7b33bb1ff328.tar.gz
meson-42843c4cf6d8e9013ebbf0f77dea7b33bb1ff328.tar.bz2
cmake: Add TARGET_ generator expression support (fixes #9305)
Diffstat (limited to 'mesonbuild/dependencies')
-rw-r--r--mesonbuild/dependencies/cmake.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/mesonbuild/dependencies/cmake.py b/mesonbuild/dependencies/cmake.py
index dcbe5df..c718e78 100644
--- a/mesonbuild/dependencies/cmake.py
+++ b/mesonbuild/dependencies/cmake.py
@@ -127,7 +127,7 @@ class CMakeDependency(ExternalDependency):
return
# Setup the trace parser
- self.traceparser = CMakeTraceParser(self.cmakebin.version(), self._get_build_dir())
+ self.traceparser = CMakeTraceParser(self.cmakebin.version(), self._get_build_dir(), self.env)
cm_args = stringlistify(extract_as_list(kwargs, 'cmake_args'))
cm_args = check_cmake_args(cm_args)
@@ -166,7 +166,7 @@ class CMakeDependency(ExternalDependency):
gen_list += [CMakeDependency.class_working_generator]
gen_list += CMakeDependency.class_cmake_generators
- temp_parser = CMakeTraceParser(self.cmakebin.version(), self._get_build_dir())
+ temp_parser = CMakeTraceParser(self.cmakebin.version(), self._get_build_dir(), self.env)
toolchain = CMakeToolchain(self.cmakebin, self.env, self.for_machine, CMakeExecScope.DEPENDENCY, self._get_build_dir())
toolchain.write()