diff options
| -rw-r--r-- | meson.build | 9 | ||||
| -rw-r--r-- | unittest/test_offline.cc | 2 |
2 files changed, 9 insertions, 2 deletions
diff --git a/meson.build b/meson.build index b14fe0c..f3be6b3 100644 --- a/meson.build +++ b/meson.build @@ -5,7 +5,7 @@ project( default_options : [ 'cpp_std=c++14' ], - meson_version : '>= 0.43.0', + meson_version : '>= 0.44.0', ) cxx = meson.get_compiler('cpp') host_system = host_machine.system() @@ -53,6 +53,7 @@ version_cc_in = configure_file( version_cc = vcs_tag( input : version_cc_in, output : 'version.cc', + fallback : 'v@0@'.format(meson.project_version()), ) libnitrokey = library( 'nitrokey', @@ -112,6 +113,12 @@ pkg.generate( install : true, ) +dep_udev = dependency('udev') +install_data( + 'data/41-nitrokey.rules', + install_dir : '@0@/rules.d'.format(dep_udev.get_pkgconfig_variable('udevdir')), +) + if get_option('tests') or get_option('offline-tests') dep_catch = dependency('catch', required : false) if not dep_catch.found() diff --git a/unittest/test_offline.cc b/unittest/test_offline.cc index 92af78c..3f79fa8 100644 --- a/unittest/test_offline.cc +++ b/unittest/test_offline.cc @@ -179,7 +179,7 @@ TEST_CASE("Test version getter", "[fast]") { std::string s = library_version; std::string version("v[0-9]+\\.[0-9]+(\\.[0-9]+)?"); std::string git_suffix("-[0-9]+-g[0-9a-z]+"); - std::regex pattern(version + "(" + git_suffix + "|)"); + std::regex pattern(version + "(" + git_suffix + ")?"); REQUIRE(std::regex_match(s, pattern)); } |