From 3e3e1683f504c655d9ee97ff677ce41dfe3d366b Mon Sep 17 00:00:00 2001 From: Matthieu Gautier Date: Mon, 12 Aug 2019 15:31:16 +0200 Subject: [PATCH] Make the gtest dependency optional. This is needed to build in flatpak. --- .gitignore | 1 + subprojects/.gitignore | 1 + test/meson.build | 23 ++++++++++++++--------- 3 files changed, 16 insertions(+), 9 deletions(-) create mode 100644 subprojects/.gitignore diff --git a/.gitignore b/.gitignore index 9f11b755a..7f993beda 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ .idea/ +*.swp diff --git a/subprojects/.gitignore b/subprojects/.gitignore new file mode 100644 index 000000000..5e17e6e11 --- /dev/null +++ b/subprojects/.gitignore @@ -0,0 +1 @@ +gtest diff --git a/test/meson.build b/test/meson.build index 3803a8b95..ad537ad3f 100644 --- a/test/meson.build +++ b/test/meson.build @@ -7,13 +7,18 @@ tests = [ ] -gtest_dep = dependency('gtest', main:true, fallback: ['gtest', 'gtest_dep']) +gtest_dep = dependency('gtest', + main:true, + fallback: ['gtest', 'gtest_dep'], + required:false) -foreach test_name : tests - test_exe = executable(test_name, [test_name+'.cpp'], - link_with : kiwixlib, - link_args: extra_link_args, - dependencies : all_deps + [gtest_dep], - build_rpath : '$ORIGIN') - test(test_name, test_exe) -endforeach +if gtest_dep.found() + foreach test_name : tests + test_exe = executable(test_name, [test_name+'.cpp'], + link_with : kiwixlib, + link_args: extra_link_args, + dependencies : all_deps + [gtest_dep], + build_rpath : '$ORIGIN') + test(test_name, test_exe) + endforeach +endif