aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--dependencies.py4
-rw-r--r--test cases/frameworks/1 boost/meson.build4
-rw-r--r--test cases/frameworks/2 gtest/meson.build2
-rw-r--r--test cases/frameworks/3 gmock/meson.build4
-rw-r--r--test cases/frameworks/4 qt5/meson.build2
-rw-r--r--test cases/frameworks/5 protocol buffers/meson.build2
-rw-r--r--test cases/linuxlike/1 pkg-config/meson.build6
-rw-r--r--test cases/objc/2 nsstring/meson.build4
8 files changed, 17 insertions, 11 deletions
diff --git a/dependencies.py b/dependencies.py
index 94c1e28..da5111a 100644
--- a/dependencies.py
+++ b/dependencies.py
@@ -155,7 +155,9 @@ class ExternalLibrary(Dependency):
return []
def find_external_dependency(name, kwargs):
- required = kwargs.get('required', False)
+ required = kwargs.get('required', True)
+ if not isinstance(required, bool):
+ raise DependencyException('Keyword "required" must be a boolean.')
if name in packages:
dep = packages[name](kwargs)
if required and not dep.found():
diff --git a/test cases/frameworks/1 boost/meson.build b/test cases/frameworks/1 boost/meson.build
index 4bd5582..82a5e54 100644
--- a/test cases/frameworks/1 boost/meson.build
+++ b/test cases/frameworks/1 boost/meson.build
@@ -4,8 +4,8 @@ project('boosttest', 'cxx')
# within one project. The need to be independent of each other.
# Use one without a library dependency and one with it.
-nolinkdep = find_dep('boost', modules: 'utility', required : true)
-linkdep = find_dep('boost', modules : 'thread', required : true)
+nolinkdep = find_dep('boost', modules: 'utility')
+linkdep = find_dep('boost', modules : 'thread')
nolinkexe = executable('nolinkedexe', 'nolinkexe.cc', deps : nolinkdep)
linkexe = executable('linkedexe', 'linkexe.cc', deps : linkdep)
diff --git a/test cases/frameworks/2 gtest/meson.build b/test cases/frameworks/2 gtest/meson.build
index 5e22365..a664c35 100644
--- a/test cases/frameworks/2 gtest/meson.build
+++ b/test cases/frameworks/2 gtest/meson.build
@@ -1,6 +1,6 @@
project('gtest', 'cxx')
-gtest = find_dep('gtest', required : true)
+gtest = find_dep('gtest')
e = executable('testprog', 'test.cc', deps : gtest)
add_test('gtest test', e)
diff --git a/test cases/frameworks/3 gmock/meson.build b/test cases/frameworks/3 gmock/meson.build
index 4e03078..90ae79c 100644
--- a/test cases/frameworks/3 gmock/meson.build
+++ b/test cases/frameworks/3 gmock/meson.build
@@ -3,8 +3,8 @@ project('gmock test', 'cxx')
# Using gmock without gtest is a pain so just
# don't support that then.
-gtest = find_dep('gtest', required : true)
-gmock = find_dep('gmock', required : true)
+gtest = find_dep('gtest')
+gmock = find_dep('gmock')
e = executable('gmocktest', 'gmocktest.cc', deps : [gtest, gmock])
add_test('gmock test', e)
diff --git a/test cases/frameworks/4 qt5/meson.build b/test cases/frameworks/4 qt5/meson.build
index edef7d6..a11d261 100644
--- a/test cases/frameworks/4 qt5/meson.build
+++ b/test cases/frameworks/4 qt5/meson.build
@@ -1,6 +1,6 @@
project('qt5 build test', 'cxx')
-qt5dep = find_dep('qt5', modules : 'Widgets', required : true)
+qt5dep = find_dep('qt5', modules : 'Widgets')
q5exe = executable('qt5test',
sources : ['main.cpp', 'mainWindow.cpp'], # Sources that don't need preprocessing.
diff --git a/test cases/frameworks/5 protocol buffers/meson.build b/test cases/frameworks/5 protocol buffers/meson.build
index e0edb4c..cbd2904 100644
--- a/test cases/frameworks/5 protocol buffers/meson.build
+++ b/test cases/frameworks/5 protocol buffers/meson.build
@@ -1,7 +1,7 @@
project('protocol buffer test', 'cxx')
protoc = find_program('protoc', required : true)
-dep = find_dep('protobuf', required : true)
+dep = find_dep('protobuf')
gen = generator(protoc, \
outputs : ['@BASENAME@.pb.cc', '@BASENAME@.pb.h'],
diff --git a/test cases/linuxlike/1 pkg-config/meson.build b/test cases/linuxlike/1 pkg-config/meson.build
index 6f60698..8032449 100644
--- a/test cases/linuxlike/1 pkg-config/meson.build
+++ b/test cases/linuxlike/1 pkg-config/meson.build
@@ -2,7 +2,11 @@ project('external dependency', 'c')
# Zlib is probably on all dev machines.
-dep = find_dep('zlib', required : true)
+dep = find_dep('zlib')
exe = executable('zlibprog', 'prog.c', deps : dep)
add_test('zlibtest', exe)
+
+# Try to find a nonexistant library to ensure requires:false works.
+
+dep = find_dep('nvakuhrabnsdfasdf', required : false)
diff --git a/test cases/objc/2 nsstring/meson.build b/test cases/objc/2 nsstring/meson.build
index 7340326..0615008 100644
--- a/test cases/objc/2 nsstring/meson.build
+++ b/test cases/objc/2 nsstring/meson.build
@@ -1,9 +1,9 @@
project('nsstring', 'objc')
if host.name() == 'darwin'
- dep = find_dep('appleframeworks', modules : 'foundation', required : true)
+ dep = find_dep('appleframeworks', modules : 'foundation')
else
- dep = find_dep('gnustep', required : true)
+ dep = find_dep('gnustep')
endif
exe = executable('stringprog', 'stringprog.m', deps : dep)
add_test('stringtest', exe)