Make cppcheck target uniq for project

This commit is contained in:
ktlo
2019-09-17 12:35:58 +00:00
parent 1de134d3f1
commit 2914afb431
3 changed files with 7 additions and 6 deletions

View File

@@ -102,6 +102,7 @@ Test:arm-linux-gnueabihf:
dependencies: dependencies:
- Restore:arm-linux-gnueabihf - Restore:arm-linux-gnueabihf
- Build:arm-linux-gnueabihf - Build:arm-linux-gnueabihf
when: manual
Test:x86_64-alpine-linux-musl: Test:x86_64-alpine-linux-musl:
<<: *test <<: *test

View File

@@ -29,8 +29,8 @@ endif
dep = declare_dependency(link_with : chosen_lib, include_directories : includes) dep = declare_dependency(link_with : chosen_lib, include_directories : includes)
cppcheck = custom_target('cppcheck_internal', cppcheck = custom_target(meson.project_name() + '_cppcheck_internal',
output : 'cppcheck.log', output : meson.project_name() + '_cppcheck.log',
input : sources + test_files, input : sources + test_files,
command : [ command : [
'cppcheck', 'cppcheck',
@@ -39,7 +39,7 @@ cppcheck = custom_target('cppcheck_internal',
'-I', meson.current_source_dir() / 'src', '-I', meson.current_source_dir() / 'src',
'@INPUT@', '@INPUT@',
# '--project=compile_commands.json', # '--project=compile_commands.json',
'--output-file=cppcheck.log' '--output-file=@OUTPUT@'
]) ])
run_target('cppcheck', command : ['cat', meson.current_build_dir() / 'cppcheck.log'], depends : cppcheck) run_target('cppcheck', command : ['cat', cppcheck.full_path()], depends : cppcheck)

View File

@@ -20,9 +20,9 @@ namespace std {
namespace tests { namespace tests {
class assertion_error : std::runtime_error { class assertion_error : public std::runtime_error {
public: public:
explicit assertion_error(const std::string & message) : ::std::runtime_error(message) {} explicit assertion_error(const std::string & message) : std::runtime_error(message) {}
}; };
struct { struct {