Fixing EXCLUDE consistency and filtering in cpplint

ament · Mar 8, 2024 · 24e2cd6 · 24e2cd6
1 parent 2d4f46c
commit 24e2cd6
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/ament_cmake_cpplint/cmake/ament_cpplint.cmake b/ament_cmake_cpplint/cmake/ament_cpplint.cmake
@@ -34,7 +34,7 @@
 # @public
 #
 function(ament_cpplint)
-  cmake_parse_arguments(ARG "" "EXCLUDE;MAX_LINE_LENGTH;ROOT;TESTNAME;TIMEOUT" "FILTERS" ${ARGN})
+  cmake_parse_arguments(ARG "" "MAX_LINE_LENGTH;ROOT;TESTNAME;TIMEOUT" "FILTERS;EXCLUDE" ${ARGN})
   if(NOT ARG_TESTNAME)
     set(ARG_TESTNAME "cpplint")
   endif()
@@ -51,7 +51,7 @@ function(ament_cpplint)
   endif()
   if(ARG_FILTERS)
     string(REPLACE ";" "," filters "${ARG_FILTERS}")
-    list(APPEND cmd "--filters=${filters}")
+    list(APPEND cmd "--filter=${filters}")
   endif()
   if(ARG_MAX_LINE_LENGTH)
     list(APPEND cmd "--linelength" "${ARG_MAX_LINE_LENGTH}")

diff --git a/ament_cmake_flake8/cmake/ament_flake8.cmake b/ament_cmake_flake8/cmake/ament_flake8.cmake
@@ -39,7 +39,7 @@
 # @public
 #
 function(ament_flake8)
-  cmake_parse_arguments(ARG "" "EXCLUDE;MAX_LINE_LENGTH;TESTNAME;CONFIG_FILE" "" ${ARGN})
+  cmake_parse_arguments(ARG "" "MAX_LINE_LENGTH;TESTNAME;CONFIG_FILE" "EXCLUDE" ${ARGN})
   if(NOT ARG_TESTNAME)
     set(ARG_TESTNAME "flake8")
   endif()