Skip to content

Commit

Permalink
XXX: HACK:
Browse files Browse the repository at this point in the history
  • Loading branch information
jon-turney committed Nov 18, 2021
1 parent d8954ca commit 85da12c
Showing 1 changed file with 2 additions and 1 deletion.
3 changes: 2 additions & 1 deletion mesonbuild/dependencies/cmake.py
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@
import re
import os
import shutil
import sys
import textwrap
import typing as T

Expand Down Expand Up @@ -615,7 +616,7 @@ def _detect_dep(self, name: str, package_version: str, modules: T.List[T.Tuple[s
libraries += [j]
elif os.path.isabs(j) and os.path.exists(j):
libraries += [j]
elif self.env.machines.build.is_windows() and reg_is_maybe_bare_lib.match(j):
elif self.env.machines.build.is_windows() and reg_is_maybe_bare_lib.match(j) and sys.platform.lower() != 'msys':
# On Windows, CMake library dependencies can be passed as bare library names,
# e.g. 'version' should translate into 'version.lib'. CMake brute-forces a
# combination of prefix/suffix combinations to find the right library, however
Expand Down

0 comments on commit 85da12c

Please sign in to comment.