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/dependencies | |
| 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/dependencies')
| -rw-r--r-- | mesonbuild/dependencies/cmake.py | 4 | ||||
| -rw-r--r-- | mesonbuild/dependencies/data/__init__.py | 0 |
2 files changed, 2 insertions, 2 deletions
diff --git a/mesonbuild/dependencies/cmake.py b/mesonbuild/dependencies/cmake.py index a6898f8..dcbe5df 100644 --- a/mesonbuild/dependencies/cmake.py +++ b/mesonbuild/dependencies/cmake.py @@ -14,9 +14,9 @@ from .base import ExternalDependency, DependencyException, DependencyTypeName from ..mesonlib import is_windows, MesonException, OptionKey, PerMachine, stringlistify, extract_as_list -from ..mesondata import mesondata from ..cmake import CMakeExecutor, CMakeTraceParser, CMakeException, CMakeToolchain, CMakeExecScope, check_cmake_args, CMakeTarget, resolve_cmake_trace_targets, cmake_is_debug from .. import mlog +import importlib.resources from pathlib import Path import functools import re @@ -583,7 +583,7 @@ class CMakeDependency(ExternalDependency): shutil.rmtree(cmake_files.as_posix(), ignore_errors=True) # Insert language parameters into the CMakeLists.txt and write new CMakeLists.txt - cmake_txt = mesondata['dependencies/data/' + cmake_file].data + cmake_txt = importlib.resources.read_text('mesonbuild.dependencies.data', cmake_file, encoding = 'utf-8') # 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 diff --git a/mesonbuild/dependencies/data/__init__.py b/mesonbuild/dependencies/data/__init__.py new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/mesonbuild/dependencies/data/__init__.py |