diff options
| author | Szczepan Zalega <szczepan@nitrokey.com> | 2020-08-24 12:31:10 +0200 |
|---|---|---|
| committer | Szczepan Zalega <szczepan@nitrokey.com> | 2020-08-24 12:31:34 +0200 |
| commit | a8e6dbfdc0169d3e5286e80450c8fedf7fa1cc24 (patch) | |
| tree | 1000c4bb43808a0ff2ab67ae5c1dae8caa338407 /meson.build | |
| parent | a6e21cc458147ef028e0a77784b7ec43c6be6d1e (diff) | |
| parent | 6b9e269afd3bf5793423e28ec1c2b45f1af044d7 (diff) | |
| download | libnitrokey-a8e6dbfdc0169d3e5286e80450c8fedf7fa1cc24.tar.gz libnitrokey-a8e6dbfdc0169d3e5286e80450c8fedf7fa1cc24.tar.bz2 | |
Merge branch '186-meson-cleanup'
Remove Meson v0.44 backward compatibility
Version update
Fixes #186
Diffstat (limited to 'meson.build')
| -rw-r--r-- | meson.build | 16 |
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, ) |