diff options
| author | Jussi Pakkanen <jpakkane@gmail.com> | 2022-03-07 16:12:19 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-03-07 16:12:19 +0200 |
| commit | 219f40c1e4689060f3c299edd463fc5f5a625608 (patch) | |
| tree | 0f3d2565382221b62368569cc049be2f0389f670 /mesonbuild/dependencies | |
| parent | 0f2f87a003477bd79487a47d5f60f67751e2f44e (diff) | |
| parent | 7ab2ceb2733442a2c3ca1284f545f28abcd5a14a (diff) | |
| download | meson-219f40c1e4689060f3c299edd463fc5f5a625608.zip meson-219f40c1e4689060f3c299edd463fc5f5a625608.tar.gz meson-219f40c1e4689060f3c299edd463fc5f5a625608.tar.bz2 | |
Merge pull request #9743 from mensinda/cmakeGeneratorFixed
cmake: Add TARGET_ generator expression support (fixes #9305)
Diffstat (limited to 'mesonbuild/dependencies')
| -rw-r--r-- | mesonbuild/dependencies/cmake.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mesonbuild/dependencies/cmake.py b/mesonbuild/dependencies/cmake.py index 09f7f14..cff0e58 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() |