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/dependencies/base.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/dependencies/base.py')
-rw-r--r-- | mesonbuild/dependencies/base.py | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/mesonbuild/dependencies/base.py b/mesonbuild/dependencies/base.py index 23701da..4c9c9fe 100644 --- a/mesonbuild/dependencies/base.py +++ b/mesonbuild/dependencies/base.py @@ -29,8 +29,6 @@ import typing as T from enum import Enum from pathlib import Path, PurePath -import pkg_resources - from .. import mlog from .. import mesonlib from ..compilers import clib_langs @@ -40,6 +38,7 @@ from ..cmake import CMakeExecutor, CMakeTraceParser, CMakeException from ..mesonlib import MachineChoice, MesonException, OrderedSet, PerMachine from ..mesonlib import Popen_safe, version_compare_many, version_compare, listify, stringlistify, extract_as_list, split_args from ..mesonlib import Version, LibType +from ..mesondata import mesondata if T.TYPE_CHECKING: from ..compilers.compilers import CompilerType # noqa: F401 @@ -1512,8 +1511,7 @@ class CMakeDependency(ExternalDependency): build_dir = self._get_build_dir() # Insert language parameters into the CMakeLists.txt and write new CMakeLists.txt - # Per the warning in pkg_resources, this is *not* a path and os.path and Pathlib are *not* safe to use here. - cmake_txt = pkg_resources.resource_string('mesonbuild', 'dependencies/data/' + cmake_file).decode() + cmake_txt = mesondata['dependencies/data/' + cmake_file].data # In general, some Fortran CMake find_package() also require C language enabled, # even if nothing from C is directly used. An easy Fortran example that fails |