From f9b19e73a5b87a2f3c8506cf19cfd5bbc468e938 Mon Sep 17 00:00:00 2001 From: Dylan Baker Date: Thu, 3 Dec 2020 11:37:52 -0800 Subject: move OptionKey to mesonlib There's starting to be a lot of things including coredata that coredata needs to itself include. putting it in mesonlib makes more sense --- mesonbuild/backend/ninjabackend.py | 3 +-- mesonbuild/backend/vs2010backend.py | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) (limited to 'mesonbuild/backend') diff --git a/mesonbuild/backend/ninjabackend.py b/mesonbuild/backend/ninjabackend.py index 39e0645..a4cdefd 100644 --- a/mesonbuild/backend/ninjabackend.py +++ b/mesonbuild/backend/ninjabackend.py @@ -43,11 +43,10 @@ from ..mesonlib import ( File, LibType, MachineChoice, MesonException, OrderedSet, PerMachine, ProgressBar, quote_arg, unholder, ) -from ..mesonlib import get_compiler_for_source, has_path_sep +from ..mesonlib import get_compiler_for_source, has_path_sep, OptionKey from .backends import CleanTrees from ..build import InvalidArguments from ..interpreter import Interpreter -from ..coredata import OptionKey if T.TYPE_CHECKING: from ..linkers import StaticLinker diff --git a/mesonbuild/backend/vs2010backend.py b/mesonbuild/backend/vs2010backend.py index f893e8f..8af83e6 100644 --- a/mesonbuild/backend/vs2010backend.py +++ b/mesonbuild/backend/vs2010backend.py @@ -28,10 +28,9 @@ from .. import mlog from .. import compilers from ..interpreter import Interpreter from ..mesonlib import ( - MesonException, File, python_command, replace_if_different + MesonException, File, python_command, replace_if_different, OptionKey, ) from ..environment import Environment, build_filename -from ..coredata import OptionKey def autodetect_vs_version(build: T.Optional[build.Build], interpreter: T.Optional[Interpreter]): vs_version = os.getenv('VisualStudioVersion', None) -- cgit v1.1