Skip to content

Commit

Permalink
meson: Fix CodeQL warning about the cyclic import
Browse files Browse the repository at this point in the history
  • Loading branch information
artem committed Nov 3, 2024
1 parent 8152aac commit 9bbcc0b
Showing 1 changed file with 3 additions and 2 deletions.
5 changes: 3 additions & 2 deletions mesonbuild/dependencies/base.py
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
import uuid
from enum import Enum

from .. import mlog, mesonlib, build
from .. import mlog, mesonlib
from ..compilers import clib_langs
from ..mesonlib import LibType, MachineChoice, MesonException, HoldableObject, version_compare_many
from ..options import OptionKey
Expand Down Expand Up @@ -340,10 +340,11 @@ def get_partial_dependency(self, *, compile_args: bool = False,
final_sources, final_extra_files, final_deps, self.variables, [], [], [])

def get_include_dirs(self) -> T.List['IncludeDirs']:
from ..build import IncludeDirs
ids = self.include_directories
if self.include_type != 'preserve':
is_system = self.include_type == 'system'
ids = [build.IncludeDirs(x.get_curdir(), x.get_incdirs(), is_system, x.get_extra_build_dirs()) for x in ids]
ids = [IncludeDirs(x.get_curdir(), x.get_incdirs(), is_system, x.get_extra_build_dirs()) for x in ids]
return ids

def get_variable(self, *, cmake: T.Optional[str] = None, pkgconfig: T.Optional[str] = None,
Expand Down

0 comments on commit 9bbcc0b

Please sign in to comment.