aboutsummaryrefslogtreecommitdiff
path: root/mesonbuild/cmake
diff options
context:
space:
mode:
authorDylan Baker <dylan@pnwbakers.com>2020-12-03 11:37:52 -0800
committerDylan Baker <dylan@pnwbakers.com>2021-01-04 12:20:40 -0800
commitf9b19e73a5b87a2f3c8506cf19cfd5bbc468e938 (patch)
tree62a822655f89133babd261a18adc40e3cb44a0fe /mesonbuild/cmake
parentfe973d9fc45581f20fefc41fc0b8eb0066c0129d (diff)
downloadmeson-f9b19e73a5b87a2f3c8506cf19cfd5bbc468e938.zip
meson-f9b19e73a5b87a2f3c8506cf19cfd5bbc468e938.tar.gz
meson-f9b19e73a5b87a2f3c8506cf19cfd5bbc468e938.tar.bz2
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
Diffstat (limited to 'mesonbuild/cmake')
-rw-r--r--mesonbuild/cmake/interpreter.py3
1 files changed, 1 insertions, 2 deletions
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,