From b364104ab1d7f99266c042e69c8c9c97d872c05c Mon Sep 17 00:00:00 2001 From: Guldoman Date: Sun, 25 Feb 2024 20:19:43 +0100 Subject: Use vendored `microtar` version in `meson.build` (#77) * Use vendored `microtar` version in `meson.build` * Remove version from `meson.build` --- meson.build | 17 +++++------------ 1 file changed, 5 insertions(+), 12 deletions(-) diff --git a/meson.build b/meson.build index eed1d7a..39e83dc 100644 --- a/meson.build +++ b/meson.build @@ -1,6 +1,5 @@ project('lpm', ['c'], - version : '1.0.4', license : 'LPM', meson_version : '>= 0.56', ) @@ -12,7 +11,6 @@ mbedtls_dep = dependency('mbedtls', version: '<3', required: false) libgit2_dep = dependency('libgit2') libzip_dep = dependency('libzip') lua_dep = dependency('lua') -microtar_dep = dependency('microtar', required: false) if not mbedtls_dep.found() # Using has_headers to distinguish between mbedtls2 and mbedtls3 @@ -33,16 +31,11 @@ if not mbedtls_dep.found() endif endif -if not microtar_dep.found() - microtar_lib = static_library('microtar', files('lib/microtar/src/microtar.c')) - - microtar_dep = declare_dependency( - link_whole: [microtar_lib], - include_directories: ['lib/microtar/src'] - ) - - message('Using git module for microtar') -endif +microtar_lib = static_library('microtar', files('lib/microtar/src/microtar.c')) +microtar_dep = declare_dependency( + link_whole: [microtar_lib], + include_directories: ['lib/microtar/src'] +) lpm_source = files('src/lpm.c') cflags = [] -- cgit v1.2.3