diff options
| author | Eli Schwartz <eschwartz@archlinux.org> | 2021-10-31 20:23:23 -0400 |
|---|---|---|
| committer | Eli Schwartz <eschwartz@archlinux.org> | 2022-01-10 18:36:57 -0500 |
| commit | 140097faf0eddcc7819a3353eb7c21b82a7df1e0 (patch) | |
| tree | b70acd7f70f5431a06db73f3db23f86ff896c3b3 /mesonbuild/cmake | |
| parent | be6e09bfdb5c911eecbc976ed71d427f052a1b81 (diff) | |
| download | meson-140097faf0eddcc7819a3353eb7c21b82a7df1e0.zip meson-140097faf0eddcc7819a3353eb7c21b82a7df1e0.tar.gz meson-140097faf0eddcc7819a3353eb7c21b82a7df1e0.tar.bz2 | |
port from embedded data to importlib.resources
Diffstat (limited to 'mesonbuild/cmake')
| -rw-r--r-- | mesonbuild/cmake/data/__init__.py | 0 | ||||
| -rw-r--r-- | mesonbuild/cmake/interpreter.py | 4 |
2 files changed, 2 insertions, 2 deletions
diff --git a/mesonbuild/cmake/data/__init__.py b/mesonbuild/cmake/data/__init__.py new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/mesonbuild/cmake/data/__init__.py diff --git a/mesonbuild/cmake/interpreter.py b/mesonbuild/cmake/interpreter.py index c2e2d27..0b6d241 100644 --- a/mesonbuild/cmake/interpreter.py +++ b/mesonbuild/cmake/interpreter.py @@ -24,7 +24,7 @@ from .traceparser import CMakeTraceParser, CMakeGeneratorTarget from .tracetargets import resolve_cmake_trace_targets from .. import mlog, mesonlib from ..mesonlib import MachineChoice, OrderedSet, version_compare, path_is_in_root, relative_to_if_possible, OptionKey -from ..mesondata import mesondata +from ..mesondata import DataFile from ..compilers.compilers import assembler_suffixes, lang_suffixes, header_suffixes, obj_suffixes, lib_suffixes, is_header from ..programs import ExternalProgram from ..coredata import FORBIDDEN_TARGET_NAMES @@ -816,7 +816,7 @@ class CMakeInterpreter: raise CMakeException('Unable to find CMake') self.trace = CMakeTraceParser(cmake_exe.version(), self.build_dir, permissive=True) - preload_file = mesondata['cmake/data/preload.cmake'].write_to_private(self.env) + preload_file = DataFile('cmake/data/preload.cmake').write_to_private(self.env) toolchain = CMakeToolchain(cmake_exe, self.env, self.for_machine, CMakeExecScope.SUBPROJECT, self.build_dir, preload_file) toolchain_file = toolchain.write() |