change build to cmake

PepperlFuchs · Nov 8, 2023 · 30ef9db · 30ef9db
1 parent 770d69c
commit 30ef9db
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 57 deletions.
diff --git a/src/pf_description/CMakeLists.txt b/src/pf_description/CMakeLists.txt
@@ -1,28 +1,14 @@
-cmake_minimum_required(VERSION 3.0.2)
+cmake_minimum_required(VERSION 3.7)
 project(pf_description)
 
-## Compile as C++11, supported in ROS Kinetic and newer
-# add_compile_options(-std=c++11)
+find_package(ament_cmake REQUIRED)
 
-## Find catkin macros and libraries
-## if COMPONENTS list like find_package(catkin REQUIRED COMPONENTS xyz)
-## is used, also find other catkin packages
-find_package(catkin REQUIRED)
-
-catkin_package(
-#  INCLUDE_DIRS include
-#  LIBRARIES pf_description
-#  CATKIN_DEPENDS joint_state_publisher robot_state_publisher rviz urdf xacro
-#  DEPENDS system_lib
-)
-
-install(DIRECTORY launch DESTINATION ${CATKIN_PACKAGE_SHARE_DESTINATION})
-install(DIRECTORY urdf DESTINATION ${CATKIN_PACKAGE_SHARE_DESTINATION})
-install(DIRECTORY meshes DESTINATION ${CATKIN_PACKAGE_SHARE_DESTINATION})
-install(DIRECTORY rviz DESTINATION ${CATKIN_PACKAGE_SHARE_DESTINATION})
-
-if(CATKIN_ENABLE_TESTING)
+if(BUILD_TESTING)
   find_package(rostest REQUIRED)
   add_rostest(tests/test_r2000_bringup.launch)
   add_rostest(tests/test_r2300_bringup.launch)
 endif()
+
+install(DIRECTORY launch meshes rviz urdf DESTINATION share/${PROJECT_NAME})
+
+ament_package()
diff --git a/src/pf_description/package.xml b/src/pf_description/package.xml
@@ -20,6 +20,6 @@
   <test_depend>python3-pytest</test_depend>
 
   <export>
-    <build_type>ament_python</build_type>
+    <build_type>ament_cmake</build_type>
   </export>
 </package>
diff --git a/src/pf_description/setup.cfg b/src/pf_description/setup.cfg
diff --git a/src/pf_description/setup.py b/src/pf_description/setup.py