aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIgor Raits <i.gnatenko.brain@gmail.com>2020-08-23 18:25:38 +0200
committerIgor Raits <i.gnatenko.brain@gmail.com>2020-08-23 18:25:38 +0200
commit6b9e269afd3bf5793423e28ec1c2b45f1af044d7 (patch)
tree1000c4bb43808a0ff2ab67ae5c1dae8caa338407
parenta6e21cc458147ef028e0a77784b7ec43c6be6d1e (diff)
downloadlibnitrokey-6b9e269afd3bf5793423e28ec1c2b45f1af044d7.tar.gz
libnitrokey-6b9e269afd3bf5793423e28ec1c2b45f1af044d7.tar.bz2
meson: Trivial cleanups
Signed-off-by: Igor Raits <i.gnatenko.brain@gmail.com>
-rw-r--r--meson.build16
1 files changed, 3 insertions, 13 deletions
diff --git a/meson.build b/meson.build
index 58abb1b..15bbe89 100644
--- a/meson.build
+++ b/meson.build
@@ -1,11 +1,11 @@
project(
'libnitrokey', 'cpp',
- version : '3.5.0',
+ version : '3.6.0-rc1',
license : 'LGPL-3.0+',
default_options : [
'cpp_std=c++14'
],
- meson_version : '>= 0.44.0',
+ meson_version : '>= 0.48.0',
)
cxx = meson.get_compiler('cpp')
host_system = host_machine.system()
@@ -107,22 +107,12 @@ ext_libnitrokey = declare_dependency(
include_directories : inc_libnitrokey,
)
-if meson.version().version_compare('>= 0.48.0')
- dep_hidapi_name = dep_hidapi.name()
-else
- if target_machine.system() == 'freebsd'
- dep_hidapi_name = 'hidapi'
- else
- dep_hidapi_name = 'hidapi-libusb'
- endif
-endif
-
pkg.generate(
name : meson.project_name(),
filebase : 'libnitrokey-1',
libraries : libnitrokey,
version : meson.project_version(),
- requires_private : dep_hidapi_name,
+ requires_private : dep_hidapi.name(),
description : 'Library for communicating with Nitrokey in a clean and easy manner',
install : true,
)