From 2b0dbdb9434935522ea11204b01f296b3161d223 Mon Sep 17 00:00:00 2001 From: UIS Date: Mon, 9 Nov 2020 19:29:17 +0300 Subject: [PATCH] Use local protobuf when avaliable --- meson.build | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/meson.build b/meson.build index e8049a88..5b6fcbb8 100644 --- a/meson.build +++ b/meson.build @@ -12,11 +12,12 @@ add_project_arguments(['-Wno-unused-parameter', '-Wno-sign-compare'], language: ['c', 'cpp']) -protobuf_c_dep = subproject('protobuf-c').get_variable('protobuf_c_dep') - c = meson.get_compiler('c') cc = meson.get_compiler('cpp') +protobuf_c_dep = c.find_library('protobuf-c', required : false) +protoc_c = find_program('protoc', required: false) + prog_python2 = find_program('python2') build_native_ui = get_option('native_ui') @@ -26,10 +27,16 @@ if build_webui and build_native_ui endif if meson.is_cross_build() - protoc_c = subproject('protobuf-c').get_variable('protoc_c_native') + protobuf_c_dep = subproject('protobuf-c').get_variable('protobuf_c_dep') + if not protoc.found() + protoc_c = subproject('protobuf-c').get_variable('protoc_c_native') + endif leg = subproject('peg').get_variable('leg_native') else - protoc_c = subproject('protobuf-c').get_variable('protoc_c') + if not protobuf_c_dep.found() or not protoc_c.found() + protobuf_c_dep = subproject('protobuf-c').get_variable('protobuf_c_dep') + protoc_c = subproject('protobuf-c').get_variable('protoc_c') + endif leg = subproject('peg').get_variable('leg') endif