From c95519830d070c63b29fb4b4d81a71f7e34946e1 Mon Sep 17 00:00:00 2001
From: Přemysl Janouch
Date: Sun, 18 Jan 2015 22:55:55 +0100
Subject: Update vera++
---
.gitmodules | 2 +-
CMakeLists.txt | 5 ++++-
vera++ | 2 +-
3 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/.gitmodules b/.gitmodules
index 40e3a29..0345c6e 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,3 +1,3 @@
[submodule "vera++"]
path = vera++
- url = https://bitbucket.org/ThArGos/vera.git
+ url = https://bitbucket.org/verateam/vera.git
diff --git a/CMakeLists.txt b/CMakeLists.txt
index f09c876..ebdefca 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -275,6 +275,9 @@ GENERATE_CPPCHECK (SOURCES liblogdiag src tests ENABLE_IDS all
TARGET_NAME ${CMAKE_PROJECT_NAME}_cppcheck INCLUDES ${CMAKE_CURRENT_BINARY_DIR})
if (OPTION_USE_VERA)
+ # Force this off, we don't need it
+ option (VERA_LUA "" OFF)
+
# Make it build within the same build tree
get_directory_property (backup_includes INCLUDE_DIRECTORIES)
set_directory_properties (PROPERTIES INCLUDE_DIRECTORIES "")
@@ -291,7 +294,7 @@ if (OPTION_USE_VERA)
set (vera_srcs ${liblogdiag_SOURCES} ${logdiag_SOURCES} ${logdiag_HEADERS})
set (vera_output ${CMAKE_CURRENT_BINARY_DIR}/vera.log)
add_custom_command (OUTPUT ${vera_output}
- COMMAND vera++
+ COMMAND vera
-R F001 -R L001 -R T001 -R T004 -R T005 -R T006
-R T007 -R T009 -R T010 -R T015 -R T017 -R T018
-R L004 -P max-line-length=80
diff --git a/vera++ b/vera++
index b519b74..45f3ab8 160000
--- a/vera++
+++ b/vera++
@@ -1 +1 @@
-Subproject commit b519b74ff8ecf792ee52eca7d294c64210f99380
+Subproject commit 45f3ab870d3722891642098bd7fc0d6fc97c8571
--
cgit v1.2.3-70-g09d2