aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIgor Gnatenko <i.gnatenko.brain@gmail.com>2018-07-18 13:46:29 +0200
committerIgor Gnatenko <i.gnatenko.brain@gmail.com>2018-07-18 13:52:49 +0200
commit586be530f0782499088708e34cf05073924ecb9c (patch)
treecd4b796ca75969342c322d2d73aed4f3e84216dc
parentbfb4fd3db104ce9d65129e8a24ab940ae2c968c5 (diff)
downloadlibnitrokey-586be530f0782499088708e34cf05073924ecb9c.tar.gz
libnitrokey-586be530f0782499088708e34cf05073924ecb9c.tar.bz2
meson: fix usage of system-wide catch
Signed-off-by: Igor Gnatenko <i.gnatenko.brain@gmail.com>
-rw-r--r--meson.build12
1 files changed, 4 insertions, 8 deletions
diff --git a/meson.build b/meson.build
index 148fadf..c81fbbf 100644
--- a/meson.build
+++ b/meson.build
@@ -113,23 +113,19 @@ pkg.generate(
)
if get_option('tests') or get_option('offline-tests')
- # FIXME
- _inc_catch = include_directories('/usr/include/catch')
- if not cxx.has_header('catch.hpp', include_directories : _inc_catch)
- error('Can\'t find catch.hpp')
- endif
+ dep_catch = dependency('catch')
_catch = static_library(
'catch',
sources : [
'unittest/catch_main.cpp',
],
- include_directories : [
- _inc_catch,
+ dependencies : [
+ dep_catch,
],
)
_dep_catch = declare_dependency(
link_with : _catch,
- include_directories : _inc_catch,
+ dependencies : dep_catch,
)
endif