|
 |
11c7806 |
From a616ac00c2cd0461d98d49b7a240ec4b73111c7d Mon Sep 17 00:00:00 2001
|
|
|
11c7806 |
From: Igor Gnatenko <i.gnatenko.brain@gmail.com>
|
|
|
11c7806 |
Date: Thu, 19 Dec 2019 18:06:59 +0100
|
|
|
11c7806 |
Subject: [PATCH] meson: Bring buildsystem to parity with CMake
|
|
|
11c7806 |
|
|
|
11c7806 |
Signed-off-by: Igor Gnatenko <i.gnatenko.brain@gmail.com>
|
|
|
11c7806 |
---
|
|
|
11c7806 |
meson.build | 17 ++++++++++-------
|
|
|
11c7806 |
1 file changed, 10 insertions(+), 7 deletions(-)
|
|
|
11c7806 |
|
|
|
11c7806 |
diff --git a/meson.build b/meson.build
|
|
|
11c7806 |
index 600be6d..dc34a97 100644
|
|
|
11c7806 |
--- a/meson.build
|
|
|
11c7806 |
+++ b/meson.build
|
|
|
11c7806 |
@@ -1,6 +1,6 @@
|
|
|
11c7806 |
project(
|
|
|
11c7806 |
'libnitrokey', 'cpp',
|
|
|
11c7806 |
- version : '3.4.1',
|
|
|
11c7806 |
+ version : '3.5.0',
|
|
|
11c7806 |
license : 'LGPL-3.0+',
|
|
|
11c7806 |
default_options : [
|
|
|
11c7806 |
'cpp_std=c++14'
|
|
|
11c7806 |
@@ -150,12 +150,15 @@ if get_option('offline-tests')
|
|
|
11c7806 |
endif
|
|
|
11c7806 |
if get_option('tests')
|
|
|
11c7806 |
tests += [
|
|
|
11c7806 |
- ['test_C_API', 'test_C_API.cpp'],
|
|
|
11c7806 |
- ['test1', 'test1.cc'],
|
|
|
11c7806 |
- ['test2', 'test2.cc'],
|
|
|
11c7806 |
- ['test3', 'test3.cc'],
|
|
|
11c7806 |
- ['test_HOTP', 'test_HOTP.cc'],
|
|
|
11c7806 |
- ['test_issues', 'test_issues.cc'],
|
|
|
11c7806 |
+ ['test_C_API', 'test_C_API.cpp'],
|
|
|
11c7806 |
+ ['test1', 'test1.cc'],
|
|
|
11c7806 |
+ ['test2', 'test2.cc'],
|
|
|
11c7806 |
+ ['test3', 'test3.cc'],
|
|
|
11c7806 |
+ ['test_HOTP', 'test_HOTP.cc'],
|
|
|
11c7806 |
+ ['test_issues', 'test_issues.cc'],
|
|
|
11c7806 |
+ ['test_multiple_devices', 'test_multiple_devices.cc'],
|
|
|
11c7806 |
+ ['test_strdup', 'test_strdup.cpp'],
|
|
|
11c7806 |
+ ['test_safe', 'test_safe.cpp'],
|
|
|
11c7806 |
]
|
|
|
11c7806 |
endif
|
|
|
11c7806 |
foreach tst : tests
|
|
|
11c7806 |
--
|
|
|
11c7806 |
2.24.1
|
|
|
11c7806 |
|