diff options
| author | Jussi Pakkanen <jpakkane@gmail.com> | 2024-06-30 13:16:42 +0300 |
|---|---|---|
| committer | Jussi Pakkanen <jpakkane@gmail.com> | 2024-07-11 11:53:39 +0300 |
| commit | 0d7bb776e2d97d406b726b90090bbfa8df13232b (patch) | |
| tree | 78817e1840f0741439871682b3c25a1e40a3067f /mesonbuild/cmake | |
| parent | c2552527fb2f607052c7aed633b67dbb19f06e38 (diff) | |
| download | meson-0d7bb776e2d97d406b726b90090bbfa8df13232b.tar.gz | |
Move OptionKey in the option source file.
Diffstat (limited to 'mesonbuild/cmake')
| -rw-r--r-- | mesonbuild/cmake/common.py | 3 | ||||
| -rw-r--r-- | mesonbuild/cmake/executor.py | 3 | ||||
| -rw-r--r-- | mesonbuild/cmake/interpreter.py | 3 |
3 files changed, 6 insertions, 3 deletions
diff --git a/mesonbuild/cmake/common.py b/mesonbuild/cmake/common.py index ad4ec6b1a..d9ff55997 100644 --- a/mesonbuild/cmake/common.py +++ b/mesonbuild/cmake/common.py @@ -3,7 +3,8 @@ from __future__ import annotations -from ..mesonlib import MesonException, OptionKey +from ..mesonlib import MesonException +from ..options import OptionKey from .. import mlog from pathlib import Path import typing as T diff --git a/mesonbuild/cmake/executor.py b/mesonbuild/cmake/executor.py index 392063d58..cbe75f36c 100644 --- a/mesonbuild/cmake/executor.py +++ b/mesonbuild/cmake/executor.py @@ -10,7 +10,8 @@ import re import os from .. import mlog -from ..mesonlib import PerMachine, Popen_safe, version_compare, is_windows, OptionKey +from ..mesonlib import PerMachine, Popen_safe, version_compare, is_windows +from ..options import OptionKey from ..programs import find_external_program, NonExistingExternalProgram if T.TYPE_CHECKING: diff --git a/mesonbuild/cmake/interpreter.py b/mesonbuild/cmake/interpreter.py index f67591f68..5e6cde653 100644 --- a/mesonbuild/cmake/interpreter.py +++ b/mesonbuild/cmake/interpreter.py @@ -18,7 +18,8 @@ from .toolchain import CMakeToolchain, CMakeExecScope from .traceparser import CMakeTraceParser from .tracetargets import resolve_cmake_trace_targets from .. import mlog, mesonlib -from ..mesonlib import MachineChoice, OrderedSet, path_is_in_root, relative_to_if_possible, OptionKey +from ..mesonlib import MachineChoice, OrderedSet, path_is_in_root, relative_to_if_possible +from ..options import OptionKey from ..mesondata import DataFile from ..compilers.compilers import assembler_suffixes, lang_suffixes, header_suffixes, obj_suffixes, lib_suffixes, is_header from ..programs import ExternalProgram |