From d6ed82a78303f2e89709e2fe0ee7e4b6e518d60d Mon Sep 17 00:00:00 2001 From: Francesco Abbate Date: Tue, 25 May 2021 09:15:59 +0200 Subject: [PATCH] Configure reproc library as a meson subprojects Address issue #208 --- .gitignore | 2 +- meson.build | 5 +++-- subprojects/reproc.wrap | 4 ++++ 3 files changed, 8 insertions(+), 3 deletions(-) create mode 100644 subprojects/reproc.wrap diff --git a/.gitignore b/.gitignore index 229bf0a1..573a6242 100644 --- a/.gitignore +++ b/.gitignore @@ -6,4 +6,4 @@ build* .lite-debug.log subprojects/lua subprojects/libagg -sybprojects/lua +subprojects/reproc diff --git a/meson.build b/meson.build index 36fc8fe5..4b73a158 100644 --- a/meson.build +++ b/meson.build @@ -10,14 +10,15 @@ libdl = cc.find_library('dl', required : false) libx11 = dependency('x11', required : false) lua_dep = dependency('lua5.2', required : false) pcre2_dep = dependency('libpcre2-8') +sdl_dep = dependency('sdl2', method: 'config-tool') if not lua_dep.found() lua_subproject = subproject('lua', default_options: ['shared=false', 'use_readline=false', 'app=false']) lua_dep = lua_subproject.get_variable('lua_dep') endif -sdl_dep = dependency('sdl2', method: 'config-tool') -reproc_dep = dependency('reproc') +reproc_subproject = subproject('reproc', default_options: ['default_library=static', 'multithreaded=false', 'reproc-cpp=false', 'examples=false']) +reproc_dep = reproc_subproject.get_variable('reproc_dep') lite_deps = [lua_dep, sdl_dep, reproc_dep, pcre2_dep, libm, libdl, libx11] diff --git a/subprojects/reproc.wrap b/subprojects/reproc.wrap new file mode 100644 index 00000000..f1afb4fa --- /dev/null +++ b/subprojects/reproc.wrap @@ -0,0 +1,4 @@ +[wrap-git] +directory = reproc +url = https://github.com/franko/reproc +revision = v14.2.2-meson-1