Loading cppcheck.cfg after --project to extend settings provided by project

This commit is contained in:
Daniel Marjamäki 2021-11-05 18:57:26 +01:00
parent c39446ff77
commit b2f1a0aaa9
1 changed files with 2 additions and 2 deletions

View File

@ -121,8 +121,6 @@ bool CmdLineParser::parseFromArgs(int argc, const char* const argv[])
mSettings->exename = argv[0]; mSettings->exename = argv[0];
mSettings->loadCppcheckCfg(Path::getPathFromFilename(argv[0]) + "cppcheck.cfg");
for (int i = 1; i < argc; i++) { for (int i = 1; i < argc; i++) {
if (argv[i][0] == '-') { if (argv[i][0] == '-') {
// User define // User define
@ -919,6 +917,8 @@ bool CmdLineParser::parseFromArgs(int argc, const char* const argv[])
} }
} }
mSettings->loadCppcheckCfg(Path::getPathFromFilename(argv[0]) + "cppcheck.cfg");
// Default template format.. // Default template format..
if (mSettings->templateFormat.empty()) { if (mSettings->templateFormat.empty()) {
mSettings->templateFormat = "{bold}{file}:{line}:{column}: {red}{inconclusive:{magenta}}{severity}:{inconclusive: inconclusive:}{default} {message} [{id}]{reset}\\n{code}"; mSettings->templateFormat = "{bold}{file}:{line}:{column}: {red}{inconclusive:{magenta}}{severity}:{inconclusive: inconclusive:}{default} {message} [{id}]{reset}\\n{code}";