aboutsummaryrefslogtreecommitdiff
path: root/mesonbuild/dependencies/misc.py
diff options
context:
space:
mode:
authorDylan Baker <dylan@pnwbakers.com>2020-09-29 15:00:51 -0700
committerDylan Baker <dylan@pnwbakers.com>2020-09-29 15:00:51 -0700
commita3106776a681201b166d019a3cf27cfe07f30a87 (patch)
tree4759063f5127e8b80999705fa930ce1be7493b3e /mesonbuild/dependencies/misc.py
parent9a4750976417afd7449eb16622d65d80dcc875ac (diff)
downloadmeson-a3106776a681201b166d019a3cf27cfe07f30a87.zip
meson-a3106776a681201b166d019a3cf27cfe07f30a87.tar.gz
meson-a3106776a681201b166d019a3cf27cfe07f30a87.tar.bz2
dependencies/curses: don't try ncurses-config or system dependency on windows
with msys ncurses-config returns a unix style path (currently, though it's been fixed upstream), which the compilers don't understand, so we can't do that. Additionally, while the system search does work, there's missing include directories that need to be added.
Diffstat (limited to 'mesonbuild/dependencies/misc.py')
-rw-r--r--mesonbuild/dependencies/misc.py14
1 files changed, 9 insertions, 5 deletions
diff --git a/mesonbuild/dependencies/misc.py b/mesonbuild/dependencies/misc.py
index 2824421..15055aa 100644
--- a/mesonbuild/dependencies/misc.py
+++ b/mesonbuild/dependencies/misc.py
@@ -489,11 +489,15 @@ def curses_factory(env: 'Environment', for_machine: 'MachineChoice',
for pkg in pkgconfig_files:
candidates.append(functools.partial(PkgConfigDependency, pkg, env, kwargs))
- if DependencyMethods.CONFIG_TOOL in methods:
- candidates.append(functools.partial(CursesConfigToolDependency, 'curses', env, kwargs))
-
- if DependencyMethods.SYSTEM in methods:
- candidates.append(functools.partial(CursesSystemDependency, 'curses', env, kwargs))
+ # There are path handling problems with these methods on msys, and they
+ # don't apply to windows otherwise (cygwin is handled seperately from
+ # windows)
+ if not env.machines[for_machine].is_windows():
+ if DependencyMethods.CONFIG_TOOL in methods:
+ candidates.append(functools.partial(CursesConfigToolDependency, 'curses', env, kwargs))
+
+ if DependencyMethods.SYSTEM in methods:
+ candidates.append(functools.partial(CursesSystemDependency, 'curses', env, kwargs))
return candidates