Merge pull request #7757 from dcbaker/submit/curses-dependency

Extend the Curses dependency to use config tools and hand rolled search

3 files changed, 22 insertions, 1 deletions

diff --git a/test cases/frameworks/31 curses/meson.build b/test cases/frameworks/31 curses/meson.build
index 21483fb..796a0d8 100644
--- a/test cases/frameworks/31 curses/meson.build
+++ b/test cases/frameworks/31 curses/meson.build
@@ -1,9 +1,13 @@
 project('curses', 'c')
 
-curses = dependency('curses', required: false)
+curses = dependency('curses', required: false, method : get_option('method'), version : '>= 0')
 if not curses.found()
   error('MESON_SKIP_TEST: Curses library not found')
 endif
 
 exec = executable('basic', 'main.c', dependencies: curses)
 # didn't run the test because in general graphics fail on CI
+
+# this should fail
+not_found = dependency('curses', required: false, method : get_option('method'), version : '> 1000000')
+assert(not_found.found() == false)
diff --git a/test cases/frameworks/31 curses/meson_options.txt b/test cases/frameworks/31 curses/meson_options.txt
new file mode 100644
index 0000000..e294e83
--- /dev/null
+++ b/test cases/frameworks/31 curses/meson_options.txt
@@ -0,0 +1,6 @@
+option(
+    'method',
+    type : 'combo',
+    choices : ['pkg-config', 'config-tool', 'system'],
+    value : 'pkg-config',
+)
diff --git a/test cases/frameworks/31 curses/test.json b/test cases/frameworks/31 curses/test.json
new file mode 100644
index 0000000..3995695
--- /dev/null
+++ b/test cases/frameworks/31 curses/test.json
@@ -0,0 +1,11 @@
+{
+  "matrix": {
+    "options": {
+      "method": [
+        { "val": "pkg-config" },
+        { "val": "config-tool" },
+        { "val": "system" }
+      ]
+    }
+  }
+}