Skip to content

Commit 6326d68

Browse files
committed
getting rid of clang-tidy
1 parent f3aae74 commit 6326d68

File tree

4 files changed

+8
-64
lines changed

4 files changed

+8
-64
lines changed

ct/CMakeLists.txt

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,4 @@ add_custom_target(doc
1010

1111
add_custom_target(clang-format
1212
COMMAND ${CMAKE_COMMAND} -E echo_append "Running clang-format on CT..."
13-
VERBATIM)
14-
15-
add_custom_target(clang-tidy
16-
COMMAND ${CMAKE_COMMAND} -E echo_append "Running clang-tidy on CT..."
17-
VERBATIM)
13+
VERBATIM)

ct/cmake/clang-cxx-dev-tools.cmake

Lines changed: 4 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
# CLANG-TIDY AND CLANG-FORMAT
2-
##############################
3-
4-
# Additional targets to perform clang-format/clang-tidy
1+
##############
2+
# CLANG-FORMAT
3+
##############
54

5+
# Additional targets to perform clang-format
66

77
# function to exclude user-defined folders from the clang format- and tidy process
88
function(filter_ct_directories allItems excludeDir)
@@ -70,46 +70,3 @@ else()
7070
VERBATIM
7171
)
7272
endif()
73-
74-
# Adding clang-tidy target if clang-tidy executable is found
75-
function(ct_configure_clang_tidy TIDY_INC_DIRS)
76-
77-
ct_get_all_srcs(FALSE)
78-
79-
set(CURRENT_INC_DIRS "")
80-
81-
#message(FATAL_ERROR "Inc dirs: ${${TIDY_INC_DIRS}}")
82-
83-
foreach (THIS_INC_DIR ${${TIDY_INC_DIRS}})
84-
#message(WARNING "this inc dir: ${THIS_INC_DIR}")
85-
list(APPEND CURRENT_INC_DIRS "-I${THIS_INC_DIR}")
86-
endforeach()
87-
88-
#message(FATAL_ERROR "Current inc dirs: ${CURRENT_INC_DIRS}")
89-
90-
find_program(CLANG_TIDY_BIN "clang-tidy")
91-
if(NOT CLANG_TIDY_BIN)
92-
find_program(CLANG_TIDY_BIN "clang-tidy-3.9")
93-
endif()
94-
if(NOT CLANG_TIDY_BIN)
95-
find_program(CLANG_TIDY_BIN "clang_tidy")
96-
endif()
97-
message(STATUS ${CLANG_TIDY_BIN})
98-
if(NOT CLANG_TIDY_BIN)
99-
add_custom_target(clang-tidy
100-
COMMAND ${CMAKE_COMMAND} -E echo_append "clang-tidy executable not found"
101-
VERBATIM)
102-
else()
103-
message (STATUS "FOUND CLANG-TIDY")
104-
set(CLANG_TIDY_COMMAND COMMAND ${CLANG_TIDY_BIN} ${ALL_CXX_SOURCE_FILES} -config='' -header-filter=\".*\\/ct\\/.*\" -- -std=c++11 -fopenmp ${CURRENT_INC_DIRS})
105-
106-
add_custom_target(
107-
clang-tidy
108-
COMMAND ${CLANG_TIDY_COMMAND}
109-
COMMENT "Launching clang-tidy"
110-
WORKING_DIRECTORY ${CMAKE_PROJECT_DIR}
111-
112-
)
113-
endif() #CLANG_TIDY_BIN
114-
115-
endfunction()

ct_doc/doc/developer_info.dox

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -11,16 +11,12 @@ to align the development with ongoing activities.
1111
We support clang-format and provide a style template to automatically format the source code.
1212
Please refer to the clang-format style sheet in the package root directory for our conventions.
1313

14-
Example command for running clang-tidy:
15-
\code
16-
$ catkin build --no-deps <package_name> -v --make-args clang-tidy
17-
\endcode
18-
19-
For clang-format it's just the same:
14+
Example command for running clang-format:
2015
\code
2116
$ catkin build --no-deps <package_name> -v --make-args clang-format
2217
\endcode
2318

19+
2420
\section Explicit Template Instantiation
2521

2622
CT relies on explicit template instantiation, that means precompilation of the library for

ct_doc/doc/installation.dox

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -85,14 +85,9 @@ The following dependencies and bindings are optional but can help to enhance the
8585

8686
- MATLAB (for Matlab logging)
8787

88-
- <a href="http://clang.llvm.org/extra/clang-tidy/">clang-tidy</a>, install via
89-
\code{.sh}
90-
$ sudo apt-get install clang-tidy-3.9
91-
\endcode
92-
9388
- <a href="https://clang.llvm.org/docs/ClangFormat.html">clang-format</a>, install via
9489
\code{.sh}
95-
$ sudo apt-get install clang-format-3.9
90+
$ sudo apt-get install clang-format
9691
\endcode
9792

9893

0 commit comments

Comments
 (0)