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/cmake/interpreter.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'mesonbuild/cmake/interpreter.py') diff --git a/mesonbuild/cmake/interpreter.py b/mesonbuild/cmake/interpreter.py index 6125f15..5931fd1 100644 --- a/mesonbuild/cmake/interpreter.py +++ b/mesonbuild/cmake/interpreter.py @@ -22,7 +22,7 @@ from .executor import CMakeExecutor from .toolchain import CMakeToolchain, CMakeExecScope from .traceparser import CMakeTraceParser, CMakeGeneratorTarget from .. import mlog, mesonlib -from ..mesonlib import MachineChoice, OrderedSet, version_compare, path_is_in_root, relative_to_if_possible +from ..mesonlib import MachineChoice, OrderedSet, version_compare, path_is_in_root, relative_to_if_possible, OptionKey from ..mesondata import mesondata from ..compilers.compilers import lang_suffixes, header_suffixes, obj_suffixes, lib_suffixes, is_header from enum import Enum @@ -31,7 +31,6 @@ from pathlib import Path import typing as T import re from os import environ -from ..coredata import OptionKey from ..mparser import ( Token, -- cgit v1.1