diff options
author | Jussi Pakkanen <jpakkane@gmail.com> | 2020-07-23 13:01:29 +0300 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-07-23 13:01:29 +0300 |
commit | 18aff92d7a9f110cc3c790c61c2ced85b8d81a26 (patch) | |
tree | ceae5df73681a1d844f49d283522d438fc3612f8 /mesonbuild/cmake/interpreter.py | |
parent | 587e159d6c96afd5ff32871e8ff99699b95f2802 (diff) | |
parent | 393d6e133d9abd584a2fc414971628e84ea48b7c (diff) | |
download | meson-18aff92d7a9f110cc3c790c61c2ced85b8d81a26.zip meson-18aff92d7a9f110cc3c790c61c2ced85b8d81a26.tar.gz meson-18aff92d7a9f110cc3c790c61c2ced85b8d81a26.tar.bz2 |
Merge pull request #7461 from mensinda/noMoreSetuptools
Remove the setuptools dependency with mesondata.py
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. |