From a616ac00c2cd0461d98d49b7a240ec4b73111c7d Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Thu, 19 Dec 2019 18:06:59 +0100 Subject: meson: Bring buildsystem to parity with CMake Signed-off-by: Igor Gnatenko --- meson.build | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/meson.build b/meson.build index 600be6d..dc34a97 100644 --- a/meson.build +++ b/meson.build @@ -1,6 +1,6 @@ project( 'libnitrokey', 'cpp', - version : '3.4.1', + version : '3.5.0', license : 'LGPL-3.0+', default_options : [ 'cpp_std=c++14' @@ -150,12 +150,15 @@ if get_option('offline-tests') endif if get_option('tests') tests += [ - ['test_C_API', 'test_C_API.cpp'], - ['test1', 'test1.cc'], - ['test2', 'test2.cc'], - ['test3', 'test3.cc'], - ['test_HOTP', 'test_HOTP.cc'], - ['test_issues', 'test_issues.cc'], + ['test_C_API', 'test_C_API.cpp'], + ['test1', 'test1.cc'], + ['test2', 'test2.cc'], + ['test3', 'test3.cc'], + ['test_HOTP', 'test_HOTP.cc'], + ['test_issues', 'test_issues.cc'], + ['test_multiple_devices', 'test_multiple_devices.cc'], + ['test_strdup', 'test_strdup.cpp'], + ['test_safe', 'test_safe.cpp'], ] endif foreach tst : tests -- cgit v1.2.3 From c6494bc502db418b3f8ae44ef7e182c998b482c5 Mon Sep 17 00:00:00 2001 From: Szczepan Zalega Date: Sat, 13 Jun 2020 22:55:05 +0200 Subject: Meson: add new test --- meson.build | 1 + 1 file changed, 1 insertion(+) diff --git a/meson.build b/meson.build index dc34a97..c758a7a 100644 --- a/meson.build +++ b/meson.build @@ -155,6 +155,7 @@ if get_option('tests') ['test2', 'test2.cc'], ['test3', 'test3.cc'], ['test_HOTP', 'test_HOTP.cc'], + ['test_memory', 'test_memory.c'], ['test_issues', 'test_issues.cc'], ['test_multiple_devices', 'test_multiple_devices.cc'], ['test_strdup', 'test_strdup.cpp'], -- cgit v1.2.3 From 03a0764bb1546b504fa9e47ccf5197afa96075e9 Mon Sep 17 00:00:00 2001 From: Szczepan Zalega Date: Sat, 13 Jun 2020 23:00:08 +0200 Subject: CI: build with Meson --- .travis.yml | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/.travis.yml b/.travis.yml index 52a10e3..579796e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -49,6 +49,21 @@ matrix: - cd ../ - python3 -m pip install -r unittest/requirements.txt --user - cd unittest && python3 -m pytest -sv test_offline.py + - os: linux + dist: bionic + env: COMPILER_NAME=gcc CXX=g++-10 CC=gcc-10 + addons: + apt: + packages: + - meson + - ninja + - libhidapi-dev + - g++-10 + sources: *sources + script: + - mkdir build && meson build + - cd build && ninja + - env DESTDIR=install ninja install - os: linux dist: trusty env: COMPILER_NAME=clang CXX=clang++-3.8 CC=clang-3.8 -- cgit v1.2.3