From ff8d09f72dda8e3285fda30626ab7bae18cc7ed6 Mon Sep 17 00:00:00 2001 From: Andrew Opalach Date: Wed, 27 Nov 2024 11:44:45 -0500 Subject: Use system BLAKE3, update flake Signed-off-by: Andrew Opalach --- src/util/meson.build | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) (limited to 'src') diff --git a/src/util/meson.build b/src/util/meson.build index 57b07d9..dd67515 100644 --- a/src/util/meson.build +++ b/src/util/meson.build @@ -1,8 +1,11 @@ util_src = ['color_palette.c', 'blocking_ring_buffer.c'] -blake3_opts = cmake.subproject_options() -reltype = is_minsize ? 'MinSizeRel' : 'Release' -blake3_opts.add_cmake_defines({ 'CMAKE_BUILD_TYPE': is_debug ? 'Debug' : reltype }) -blake3_opts.add_cmake_defines({ 'CMAKE_POSITION_INDEPENDENT_CODE': true }) -blake3 = cmake.subproject('BLAKE3', options: blake3_opts).dependency('blake3') +blake3 = dependency('libblake3', required: false, allow_fallback: false) +if not blake3.found() + blake3_opts = cmake.subproject_options() + reltype = is_minsize ? 'MinSizeRel' : 'Release' + blake3_opts.add_cmake_defines({ 'CMAKE_BUILD_TYPE': is_debug ? 'Debug' : reltype }) + blake3_opts.add_cmake_defines({ 'CMAKE_POSITION_INDEPENDENT_CODE': true }) + blake3 = cmake.subproject('BLAKE3', options: blake3_opts).dependency('blake3') +endif util_deps = [blake3] util = declare_dependency(sources: util_src, dependencies: util_deps) -- cgit v1.2.3-101-g0448