Cleanup CMakeLists.txt

tesseract-robotics · Nov 18, 2021 · c62960c · c62960c
1 parent be317a7
commit c62960c
Show file tree

Hide file tree

Showing 6 changed files with 31 additions and 12 deletions.
diff --git a/tesseract_monitoring/CMakeLists.txt b/tesseract_monitoring/CMakeLists.txt
@@ -1,11 +1,14 @@
 cmake_minimum_required(VERSION 3.5.0)
-project(tesseract_monitoring)
+
+# Extract package name and version
+find_package(ros_industrial_cmake_boilerplate REQUIRED)
+extract_package_metadata(pkg)
+project(${pkg_extracted_name} VERSION ${pkg_extracted_version} LANGUAGES CXX)
 
 find_package(tesseract_environment REQUIRED)
 find_package(orocos_kdl REQUIRED)
 find_package(tesseract_common REQUIRED)
 find_package(Eigen3 REQUIRED)
-find_package(ros_industrial_cmake_boilerplate REQUIRED)
 
 find_package(catkin REQUIRED COMPONENTS
   roscpp

diff --git a/tesseract_msgs/CMakeLists.txt b/tesseract_msgs/CMakeLists.txt
@@ -1,5 +1,9 @@
 cmake_minimum_required(VERSION 3.5.0)
-project(tesseract_msgs)
+
+# Extract package name and version
+find_package(ros_industrial_cmake_boilerplate REQUIRED)
+extract_package_metadata(pkg)
+project(${pkg_extracted_name} VERSION ${pkg_extracted_version} LANGUAGES CXX)
 
 if(CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
   add_compile_options(

diff --git a/tesseract_planning_server/CMakeLists.txt b/tesseract_planning_server/CMakeLists.txt
@@ -1,5 +1,9 @@
 cmake_minimum_required(VERSION 3.5.0)
-project(tesseract_planning_server)
+
+# Extract package name and version
+find_package(ros_industrial_cmake_boilerplate REQUIRED)
+extract_package_metadata(pkg)
+project(${pkg_extracted_name} VERSION ${pkg_extracted_version} LANGUAGES CXX)
 
 find_package(catkin REQUIRED COMPONENTS
   tesseract_monitoring
@@ -13,7 +17,6 @@ find_package(Boost REQUIRED)
 find_package(Eigen3 REQUIRED)
 find_package(tesseract_command_language REQUIRED)
 find_package(tesseract_process_managers REQUIRED)
-find_package(ros_industrial_cmake_boilerplate REQUIRED)
 find_package(tesseract_common REQUIRED)
 
 catkin_package(

diff --git a/tesseract_ros_examples/CMakeLists.txt b/tesseract_ros_examples/CMakeLists.txt
@@ -1,5 +1,9 @@
-cmake_minimum_required(VERSION 2.8.3)
-project(tesseract_ros_examples)
+cmake_minimum_required(VERSION 3.5.0)
+
+# Extract package name and version
+find_package(ros_industrial_cmake_boilerplate REQUIRED)
+extract_package_metadata(pkg)
+project(${pkg_extracted_name} VERSION ${pkg_extracted_version} LANGUAGES CXX)
 
 find_package(catkin REQUIRED COMPONENTS
   roscpp
@@ -19,7 +23,6 @@ find_package(tesseract_common REQUIRED)
 find_package(tesseract_collision REQUIRED)
 find_package(trajopt_sqp REQUIRED)
 find_package(trajopt_ifopt REQUIRED)
-find_package(ros_industrial_cmake_boilerplate REQUIRED)
 find_package(PCL REQUIRED COMPONENTS core features filters io segmentation surface)
 
 catkin_package()

diff --git a/tesseract_rosutils/CMakeLists.txt b/tesseract_rosutils/CMakeLists.txt
@@ -1,5 +1,9 @@
 cmake_minimum_required(VERSION 3.5.0)
-project(tesseract_rosutils)
+
+# Extract package name and version
+find_package(ros_industrial_cmake_boilerplate REQUIRED)
+extract_package_metadata(pkg)
+project(${pkg_extracted_name} VERSION ${pkg_extracted_version} LANGUAGES CXX)
 
 find_package(catkin REQUIRED COMPONENTS
   tesseract_msgs
@@ -11,7 +15,6 @@ find_package(catkin REQUIRED COMPONENTS
 )
 
 find_package(Boost REQUIRED)
-find_package(ros_industrial_cmake_boilerplate REQUIRED)
 find_package(Eigen3 REQUIRED)
 find_package(tesseract_collision REQUIRED)
 find_package(tesseract_common REQUIRED)

diff --git a/tesseract_rviz/CMakeLists.txt b/tesseract_rviz/CMakeLists.txt
@@ -1,5 +1,9 @@
 cmake_minimum_required(VERSION 3.5.0)
-project(tesseract_rviz)
+
+# Extract package name and version
+find_package(ros_industrial_cmake_boilerplate REQUIRED)
+extract_package_metadata(pkg)
+project(${pkg_extracted_name} VERSION ${pkg_extracted_version} LANGUAGES CXX)
 
 find_package(catkin REQUIRED COMPONENTS
   roscpp
@@ -19,7 +23,6 @@ find_package(tesseract_motion_planners REQUIRED)
 find_package(tesseract_common REQUIRED)
 find_package(tesseract_visualization REQUIRED)
 find_package(Eigen3 REQUIRED)
-find_package(ros_industrial_cmake_boilerplate REQUIRED)
 
 # Ogre
 find_package(PkgConfig REQUIRED)