diff options
| author | Daniel Mensinger <daniel@mensinger-ka.de> | 2020-07-16 20:33:57 +0200 |
|---|---|---|
| committer | Daniel Mensinger <daniel@mensinger-ka.de> | 2020-07-16 21:03:23 +0200 |
| commit | 05ddd6543d4c4fc33b4c64f26291e73f49733f71 (patch) | |
| tree | d93d9e3dd08c33c0c7cb69d75e9fd94c60bb614f /mesonbuild/cmake/interpreter.py | |
| parent | 019ed04331695bb6f5c5fff70dfced34c4ba9012 (diff) | |
| download | meson-05ddd6543d4c4fc33b4c64f26291e73f49733f71.zip meson-05ddd6543d4c4fc33b4c64f26291e73f49733f71.tar.gz meson-05ddd6543d4c4fc33b4c64f26291e73f49733f71.tar.bz2 | |
mdata: remove setuptools and use mesondata instead
Diffstat (limited to 'mesonbuild/cmake/interpreter.py')
| -rw-r--r-- | mesonbuild/cmake/interpreter.py | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/mesonbuild/cmake/interpreter.py b/mesonbuild/cmake/interpreter.py index 0516947..f404109 100644 --- a/mesonbuild/cmake/interpreter.py +++ b/mesonbuild/cmake/interpreter.py @@ -15,8 +15,6 @@ # This class contains the basic functionality needed to run any interpreter # or an interpreter-based tool. -import pkg_resources - from .common import CMakeException, CMakeTarget, TargetOptions from .client import CMakeClient, RequestCMakeInputs, RequestConfigure, RequestCompute, RequestCodeModel from .fileapi import CMakeFileAPI @@ -25,6 +23,7 @@ from .traceparser import CMakeTraceParser, CMakeGeneratorTarget from .. import mlog, mesonlib from ..environment import Environment from ..mesonlib import MachineChoice, OrderedSet, version_compare +from ..mesondata import mesondata from ..compilers.compilers import lang_suffixes, header_suffixes, obj_suffixes, lib_suffixes, is_header from enum import Enum from functools import lru_cache @@ -814,7 +813,7 @@ class CMakeInterpreter: raise CMakeException('Unable to find CMake') self.trace = CMakeTraceParser(cmake_exe.version(), self.build_dir, permissive=True) - preload_file = pkg_resources.resource_filename('mesonbuild', 'cmake/data/preload.cmake') + preload_file = mesondata['cmake/data/preload.cmake'].write_to_private(self.env) # Prefere CMAKE_PROJECT_INCLUDE over CMAKE_TOOLCHAIN_FILE if possible, # since CMAKE_PROJECT_INCLUDE was actually designed for code injection. |