Skip to content

Commit 801ce61

Browse files
committed
disable uncrustify: conflicts with clang format
This disables uncrustify we use clang format Signed-off-by: Alex Moriarty <[email protected]>
1 parent c7a2de7 commit 801ce61

File tree

2 files changed

+8
-0
lines changed

2 files changed

+8
-0
lines changed

robotiq_controllers/CMakeLists.txt

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,11 @@ if(BUILD_TESTING)
5555
# comment the line when this package is in a git repo and when
5656
# a copyright and license is added to all source files
5757
set(ament_cmake_cpplint_FOUND TRUE)
58+
59+
# the following skips uncrustify
60+
# ament_uncrustify and ament_clang_format cannot both be satisfied
61+
set(ament_cmake_uncrustify_FOUND TRUE)
62+
5863
ament_lint_auto_find_test_dependencies()
5964
endif()
6065

robotiq_driver/CMakeLists.txt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -83,6 +83,9 @@ if(BUILD_TESTING)
8383
# comment the line when this package is in a git repo and when
8484
# a copyright and license is added to all source files
8585
set(ament_cmake_cpplint_FOUND TRUE)
86+
# the following skips uncrustify
87+
# ament_uncrustify and ament_clang_format cannot both be satisfied
88+
set(ament_cmake_uncrustify_FOUND TRUE)
8689
ament_lint_auto_find_test_dependencies()
8790
endif()
8891

0 commit comments

Comments
 (0)