From 978723467f6b1faa85272b3aff549c32c5bcad0e Mon Sep 17 00:00:00 2001
From: Yadunund <yadunund@openrobotics.org>
Date: Fri, 12 Nov 2021 16:23:05 +0800
Subject: [PATCH] use_ament_cmake_uncrustify

Signed-off-by: Yadunund <yadunund@openrobotics.org>
---
 rmf_task/CMakeLists.txt | 6 +++---
 rmf_task/package.xml    | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/rmf_task/CMakeLists.txt b/rmf_task/CMakeLists.txt
index a883fbc4..1d4f9aa8 100644
--- a/rmf_task/CMakeLists.txt
+++ b/rmf_task/CMakeLists.txt
@@ -26,7 +26,7 @@ find_package(rmf_battery REQUIRED)
 find_package(Eigen3 REQUIRED)
 
 find_package(ament_cmake_catch2 QUIET)
-find_package(rmf_cmake_uncrustify QUIET)
+find_package(ament_cmake_uncrustify QUIET)
 
 # ===== RMF Tasks library
 file(GLOB lib_srcs
@@ -52,7 +52,7 @@ target_include_directories(rmf_task
     ${EIGEN3_INCLUDE_DIRS}
 )
 
-if(BUILD_TESTING AND ament_cmake_catch2_FOUND AND rmf_cmake_uncrustify_FOUND)
+if(BUILD_TESTING AND ament_cmake_catch2_FOUND AND ament_cmake_uncrustify_FOUND)
   file(GLOB_RECURSE unit_test_srcs "test/*.cpp")
 
   ament_add_catch2(
@@ -73,7 +73,7 @@ if(BUILD_TESTING AND ament_cmake_catch2_FOUND AND rmf_cmake_uncrustify_FOUND)
     NAMES "rmf_code_style.cfg"
     PATHS "${rmf_utils_DIR}/../../../share/rmf_utils/")
 
-  rmf_uncrustify(
+  ament_uncrustify(
     ARGN include src test
     CONFIG_FILE ${uncrustify_config_file}
     MAX_LINE_LENGTH 80
diff --git a/rmf_task/package.xml b/rmf_task/package.xml
index 2c996964..1a4af058 100644
--- a/rmf_task/package.xml
+++ b/rmf_task/package.xml
@@ -16,7 +16,7 @@
   <depend>eigen</depend>
 
   <test_depend>ament_cmake_catch2</test_depend>
-  <test_depend>rmf_cmake_uncrustify</test_depend>
+  <test_depend>ament_cmake_uncrustify</test_depend>
 
   <export>
     <build_type>cmake</build_type>