diff --git a/packages/rang/.gitrepo b/packages/rang/.gitrepo index 07b36cbe1e0f9f53ba70936e5f34128e3d6ab287..7ef7be6c11e1889b029f3661cc2f30cf0c0182d5 100644 --- a/packages/rang/.gitrepo +++ b/packages/rang/.gitrepo @@ -6,7 +6,7 @@ [subrepo] remote = git@github.com:agauniyal/rang.git branch = master - commit = a083cae9d64edd66d0ecdd4ddebac20d090c8693 - parent = d97199d99e580797e39a626ad2ac6d87c125bcb5 - cmdver = 0.4.3 + commit = 22345aa4c468db3bd4a0e64a47722aad3518cc81 + parent = 37eab58364fa6512f2886a6a0996171974ca2e4b + cmdver = 0.4.9 method = merge diff --git a/packages/rang/meson.build b/packages/rang/meson.build index 0a7491a81949d3d19119e81aa67417ebaa7363fd..62c2020322c5e68ceb7d1c8c22335f069eee65e7 100644 --- a/packages/rang/meson.build +++ b/packages/rang/meson.build @@ -3,8 +3,15 @@ project('rang', 'cpp', version : '3.2.0', inc = include_directories('include') -doctest = dependency('doctest') -subdir('test') +rang_dep = declare_dependency(include_directories:inc) -run_target('cppcheck', command : ['cppcheck', '--project=' + - join_paths(meson.build_root(), 'compile_commands.json')]) +doctest = dependency('doctest', required: false) +if doctest.found() + subdir('test') +endif + +cppcheck = find_program('cppcheck', required: false) +if cppcheck.found() + run_target('cppcheck', command : ['cppcheck', '--project=' + + join_paths(meson.build_root(), 'compile_commands.json')]) +endif