Merge branch 'dev' into shops

This commit is contained in:
Linus Probert 2019-02-28 19:41:30 +01:00
commit 16d9035941
2 changed files with 2 additions and 1 deletions

1
.gitignore vendored
View File

@ -1,4 +1,5 @@
/.vscode/ /.vscode/
/vscode_build/
/CMakeSettings.json /CMakeSettings.json
/_build/ /_build/
/*.dll /*.dll

View File

@ -292,7 +292,7 @@ ENDIF ()
# LINT: # LINT:
if (CPPCHECK_FOUND) if (CPPCHECK_FOUND)
add_custom_target(lint add_custom_target(lint
COMMAND ${CPPCHECK_EXECUTABLE} --force --language=c --template=gcc --error-exitcode=1 --quiet --enable=warning,style,performance,portability,information,missingInclude src/ COMMAND ${CPPCHECK_EXECUTABLE} --force --language=c --template=gcc --error-exitcode=1 --quiet --suppress=unreadVariable --suppress=missingInclude --enable=warning,style,performance,portability,information,missingInclude src/
WORKING_DIRECTORY ${PROJECT_SOURCE_DIR} WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}
COMMENT "Run cppcheck" COMMENT "Run cppcheck"
) )