d3v1l/matrixion
1
0
Fork 0
mirror of https://github.com/Nheko-Reborn/nheko.git synced 2024-11-25 04:28:49 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

meson: Use system doctest if available

Browse source 
* meson.build (doctest_proj): check if available as system dependency
* blurhash.cpp: change doctest include path to doctest/doctest.h
This commit is contained in:
Nicolò Balzarotti 2021-01-20 10:29:22 +01:00 committed by nixo
parent 9b94940251
commit 445c7d81f5
2 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
blurhash.cpp
View file

@ -11,7 +11,7 @@
#endif #endif
#ifdef DOCTEST_CONFIG_IMPLEMENT_WITH_MAIN #ifdef DOCTEST_CONFIG_IMPLEMENT_WITH_MAIN
#include <doctest.h> #include <doctest/doctest.h>
#endif #endif
using namespace std::literals; using namespace std::literals;

9
meson.build
View file

@ -6,8 +6,13 @@ lib = static_library('blurhash',
'blurhash.cpp', 'blurhash.cpp',
install : true) install : true)
doctest_proj = subproject('doctest') doctest_dep = dependency('doctest', required : false)
doctest_dep = doctest_proj.get_variable('doctest_dep')
if not doctest_dep.found()
doctest_proj = subproject('doctest')
doctest_dep = doctest_proj.get_variable('doctest_dep')
endif
tests = executable('blurhash-tests', tests = executable('blurhash-tests',
'blurhash.cpp', 'blurhash.cpp',
cpp_args : '-DDOCTEST_CONFIG_IMPLEMENT_WITH_MAIN', cpp_args : '-DDOCTEST_CONFIG_IMPLEMENT_WITH_MAIN',