Extract package name and version from package.xml

Levi Armstrong · Levi-Armstrong · commit 332e568e498d · 2020-12-31T23:01:13.000-06:00
diff --git a/tesseract/tesseract_collision/CMakeLists.txt b/tesseract/tesseract_collision/CMakeLists.txt
@@ -1,5 +1,9 @@
 cmake_minimum_required(VERSION 3.6.0)
-project(tesseract_collision VERSION 0.1.0 LANGUAGES CXX)
+
+# Extract package name and version
+find_package(cmake_common_scripts REQUIRED)
+extract_package_metadata(pkg)
+project(${pkg_extracted_name} VERSION ${pkg_extracted_version} LANGUAGES CXX)
 
 if(WIN32)
   set(CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS ON)
@@ -13,7 +17,6 @@ find_package(tesseract_geometry REQUIRED)
 find_package(tesseract_common REQUIRED)
 find_package(tesseract_support REQUIRED)
 find_package(fcl 0.6 REQUIRED)
-find_package(cmake_common_scripts REQUIRED)
 find_package(Bullet REQUIRED NAMES bullet Bullet)
 
 include_directories(BEFORE ${FCL_INCLUDE_DIRS})
diff --git a/tesseract/tesseract_common/CMakeLists.txt b/tesseract/tesseract_common/CMakeLists.txt
@@ -1,5 +1,9 @@
 cmake_minimum_required(VERSION 3.5.0)
-project(tesseract_common VERSION 0.1.0 LANGUAGES CXX)
+
+# Extract package name and version
+find_package(cmake_common_scripts REQUIRED)
+extract_package_metadata(pkg)
+project(${pkg_extracted_name} VERSION ${pkg_extracted_version} LANGUAGES CXX)
 
 if(WIN32)
   set(CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS ON)
@@ -11,7 +15,6 @@ list(APPEND CMAKE_MODULE_PATH "${PROJECT_SOURCE_DIR}/cmake/")
 find_package(Boost REQUIRED COMPONENTS system filesystem program_options)
 find_package(Eigen3 REQUIRED)
 find_package(TinyXML2 REQUIRED)
-find_package(cmake_common_scripts REQUIRED)
 
 find_package(console_bridge REQUIRED)
 if(NOT TARGET console_bridge::console_bridge)
diff --git a/tesseract/tesseract_environment/CMakeLists.txt b/tesseract/tesseract_environment/CMakeLists.txt
@@ -1,5 +1,9 @@
 cmake_minimum_required(VERSION 3.5.0)
-project(tesseract_environment VERSION 0.1.0 LANGUAGES CXX)
+
+# Extract package name and version
+find_package(cmake_common_scripts REQUIRED)
+extract_package_metadata(pkg)
+project(${pkg_extracted_name} VERSION ${pkg_extracted_version} LANGUAGES CXX)
 
 if(WIN32)
   set(CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS ON)
@@ -14,7 +18,6 @@ find_package(tesseract_kinematics REQUIRED)
 find_package(tesseract_scene_graph REQUIRED)
 find_package(tesseract_urdf REQUIRED)
 find_package(tesseract_common REQUIRED)
-find_package(cmake_common_scripts REQUIRED)
 
 if(NOT TARGET console_bridge::console_bridge)
   add_library(console_bridge::console_bridge INTERFACE IMPORTED)
diff --git a/tesseract/tesseract_geometry/CMakeLists.txt b/tesseract/tesseract_geometry/CMakeLists.txt
@@ -1,5 +1,9 @@
 cmake_minimum_required(VERSION 3.5.0)
-project(tesseract_geometry VERSION 0.1.0 LANGUAGES CXX)
+
+# Extract package name and version
+find_package(cmake_common_scripts REQUIRED)
+extract_package_metadata(pkg)
+project(${pkg_extracted_name} VERSION ${pkg_extracted_version} LANGUAGES CXX)
 
 if(WIN32)
   set(CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS ON)
@@ -11,7 +15,6 @@ find_package(Eigen3 REQUIRED)
 find_package(console_bridge REQUIRED)
 find_package(tesseract_common REQUIRED)
 find_package(octomap REQUIRED)
-find_package(cmake_common_scripts REQUIRED)
 find_package(assimp REQUIRED)
 link_directories(${assimp_LIBRARY_DIRS})
 
diff --git a/tesseract/tesseract_kinematics/CMakeLists.txt b/tesseract/tesseract_kinematics/CMakeLists.txt
@@ -1,5 +1,9 @@
 cmake_minimum_required(VERSION 3.5.0)
-project(tesseract_kinematics VERSION 0.1.0 LANGUAGES CXX)
+
+# Extract package name and version
+find_package(cmake_common_scripts REQUIRED)
+extract_package_metadata(pkg)
+project(${pkg_extracted_name} VERSION ${pkg_extracted_version} LANGUAGES CXX)
 
 if(WIN32)
   set(CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS ON)
@@ -12,7 +16,6 @@ find_package(console_bridge REQUIRED)
 find_package(tesseract_scene_graph REQUIRED)
 find_package(tesseract_common REQUIRED)
 find_package(opw_kinematics REQUIRED)
-find_package(cmake_common_scripts REQUIRED)
 
 if(NOT TARGET console_bridge::console_bridge)
   add_library(console_bridge::console_bridge INTERFACE IMPORTED)
diff --git a/tesseract/tesseract_planning/tesseract_command_language/CMakeLists.txt b/tesseract/tesseract_planning/tesseract_command_language/CMakeLists.txt
@@ -1,5 +1,9 @@
 cmake_minimum_required(VERSION 3.5.0)
-project(tesseract_command_language VERSION 0.1.0 LANGUAGES CXX)
+
+# Extract package name and version
+find_package(cmake_common_scripts REQUIRED)
+extract_package_metadata(pkg)
+project(${pkg_extracted_name} VERSION ${pkg_extracted_version} LANGUAGES CXX)
 
 if(WIN32)
   set(CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS ON)
@@ -8,7 +12,6 @@ endif()
 find_package(console_bridge REQUIRED)
 find_package(tesseract_common REQUIRED)
 find_package(Eigen3 REQUIRED)
-find_package(cmake_common_scripts REQUIRED)
 find_package(Boost REQUIRED)
 
 if(NOT TARGET console_bridge::console_bridge)
diff --git a/tesseract/tesseract_planning/tesseract_motion_planners/CMakeLists.txt b/tesseract/tesseract_planning/tesseract_motion_planners/CMakeLists.txt
@@ -1,5 +1,9 @@
 cmake_minimum_required(VERSION 3.5.0)
-project(tesseract_motion_planners VERSION 0.1.0 LANGUAGES CXX)
+
+# Extract package name and version
+find_package(cmake_common_scripts REQUIRED)
+extract_package_metadata(pkg)
+project(${pkg_extracted_name} VERSION ${pkg_extracted_version} LANGUAGES CXX)
 
 if(WIN32)
   set(CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS ON)
@@ -15,7 +19,6 @@ find_package(tesseract_common REQUIRED)
 find_package(tesseract_command_language REQUIRED)
 find_package(trajopt REQUIRED)
 find_package(trajopt_sco REQUIRED)
-find_package(cmake_common_scripts REQUIRED)
 # serialization was required because ompl does not include find_dependency for its required dependencies
 find_package(Boost REQUIRED COMPONENTS serialization system filesystem program_options)
 
diff --git a/tesseract/tesseract_planning/tesseract_process_managers/CMakeLists.txt b/tesseract/tesseract_planning/tesseract_process_managers/CMakeLists.txt
@@ -1,5 +1,9 @@
 cmake_minimum_required(VERSION 3.5.0)
-project(tesseract_process_managers VERSION 0.1.0 LANGUAGES CXX)
+
+# Extract package name and version
+find_package(cmake_common_scripts REQUIRED)
+extract_package_metadata(pkg)
+project(${pkg_extracted_name} VERSION ${pkg_extracted_version} LANGUAGES CXX)
 
 if(WIN32)
   set(CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS ON)
@@ -14,7 +18,6 @@ find_package(tesseract_support REQUIRED)
 find_package(tesseract_command_language REQUIRED)
 find_package(tesseract_motion_planners REQUIRED)
 find_package(tesseract_time_parameterization REQUIRED)
-find_package(cmake_common_scripts REQUIRED)
 
 if(NOT TARGET console_bridge::console_bridge)
   add_library(console_bridge::console_bridge INTERFACE IMPORTED)
diff --git a/tesseract/tesseract_planning/tesseract_time_parameterization/CMakeLists.txt b/tesseract/tesseract_planning/tesseract_time_parameterization/CMakeLists.txt
@@ -1,5 +1,9 @@
 cmake_minimum_required(VERSION 3.5.0)
-project(tesseract_time_parameterization VERSION 0.1.0 LANGUAGES CXX)
+
+# Extract package name and version
+find_package(cmake_common_scripts REQUIRED)
+extract_package_metadata(pkg)
+project(${pkg_extracted_name} VERSION ${pkg_extracted_version} LANGUAGES CXX)
 
 if(WIN32)
   set(CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS ON)
@@ -9,7 +13,6 @@ find_package(console_bridge REQUIRED)
 find_package(tesseract_common REQUIRED)
 find_package(tesseract_command_language REQUIRED)
 find_package(Eigen3 REQUIRED)
-find_package(cmake_common_scripts REQUIRED)
 
 if(NOT TARGET console_bridge::console_bridge)
   add_library(console_bridge::console_bridge INTERFACE IMPORTED)
diff --git a/tesseract/tesseract_scene_graph/CMakeLists.txt b/tesseract/tesseract_scene_graph/CMakeLists.txt
@@ -1,5 +1,9 @@
 cmake_minimum_required(VERSION 3.5.0)
-project(tesseract_scene_graph VERSION 0.1.0 LANGUAGES CXX)
+
+# Extract package name and version
+find_package(cmake_common_scripts REQUIRED)
+extract_package_metadata(pkg)
+project(${pkg_extracted_name} VERSION ${pkg_extracted_version} LANGUAGES CXX)
 
 if(WIN32)
   set(CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS ON)
@@ -11,7 +15,6 @@ find_package(console_bridge REQUIRED)
 find_package(orocos_kdl REQUIRED)
 find_package(tesseract_geometry REQUIRED)
 find_package(tesseract_common REQUIRED)
-find_package(cmake_common_scripts REQUIRED)
 
 if(NOT TARGET console_bridge::console_bridge)
   add_library(console_bridge::console_bridge INTERFACE IMPORTED)
diff --git a/tesseract/tesseract_support/CMakeLists.txt b/tesseract/tesseract_support/CMakeLists.txt
@@ -1,8 +1,11 @@
 cmake_minimum_required(VERSION 3.5.0)
-project(tesseract_support VERSION 0.1.0)
 
-find_package(tesseract_common REQUIRED)
+# Extract package name and version
 find_package(cmake_common_scripts REQUIRED)
+extract_package_metadata(pkg)
+project(${pkg_extracted_name} VERSION ${pkg_extracted_version})
+
+find_package(tesseract_common REQUIRED)
 
 # Load variable for clang tidy args, compiler options and cxx version
 tesseract_variables()
diff --git a/tesseract/tesseract_urdf/CMakeLists.txt b/tesseract/tesseract_urdf/CMakeLists.txt
@@ -1,5 +1,9 @@
 cmake_minimum_required(VERSION 3.5.0)
-project(tesseract_urdf VERSION 0.1.0 LANGUAGES CXX)
+
+# Extract package name and version
+find_package(cmake_common_scripts REQUIRED)
+extract_package_metadata(pkg)
+project(${pkg_extracted_name} VERSION ${pkg_extracted_version} LANGUAGES CXX)
 
 if(WIN32)
   set(CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS ON)
@@ -13,7 +17,6 @@ find_package(tesseract_geometry REQUIRED)
 find_package(tesseract_common REQUIRED)
 find_package(tesseract_scene_graph REQUIRED)
 find_package(tesseract_collision REQUIRED)
-find_package(cmake_common_scripts REQUIRED)
 
 if(NOT TARGET console_bridge::console_bridge)
   add_library(console_bridge::console_bridge INTERFACE IMPORTED)
diff --git a/tesseract/tesseract_visualization/CMakeLists.txt b/tesseract/tesseract_visualization/CMakeLists.txt
@@ -1,5 +1,9 @@
 cmake_minimum_required(VERSION 3.5.0)
-project(tesseract_visualization VERSION 0.1.0 LANGUAGES CXX)
+
+# Extract package name and version
+find_package(cmake_common_scripts REQUIRED)
+extract_package_metadata(pkg)
+project(${pkg_extracted_name} VERSION ${pkg_extracted_version} LANGUAGES CXX)
 
 if(WIN32)
   set(CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS ON)
@@ -13,7 +17,6 @@ find_package(tesseract_environment REQUIRED)
 find_package(tesseract_scene_graph REQUIRED)
 find_package(tesseract_command_language REQUIRED)
 find_package(class_loader REQUIRED)
-find_package(cmake_common_scripts REQUIRED)
 
 # Optional to build ignition visualization
 find_package(ignition-common3 COMPONENTS profiler events av QUIET)
diff --git a/tesseract_python/tesseract_python/CMakeLists.txt b/tesseract_python/tesseract_python/CMakeLists.txt
@@ -1,5 +1,9 @@
 cmake_minimum_required(VERSION 3.5.0)
-project(tesseract_python)
+
+# Extract package name and version
+find_package(cmake_common_scripts REQUIRED)
+extract_package_metadata(pkg)
+project(${pkg_extracted_name} VERSION ${pkg_extracted_version})
 
 list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake/")
 
@@ -19,7 +23,6 @@ else()
   add_compile_options(/bigobj)
 endif()
 
-find_package(cmake_common_scripts REQUIRED)
 find_package(tesseract_motion_planners REQUIRED)
 find_package(tesseract_common REQUIRED)
 find_package(tesseract_geometry REQUIRED)
diff --git a/tesseract_python/tesseract_python/package.xml b/tesseract_python/tesseract_python/package.xml
@@ -6,7 +6,8 @@
   <maintainer email="wason@wasontech.com">John Wason</maintainer>
   <license>Apache 2.0</license>
   <author >John Wason</author>
-  
+
+  <build_depend>cmake_common_scripts</build_depend>
   <depend>trajopt</depend>
   <depend>tesseract_motion_planners</depend>
   <depend>tesseract_common</depend>
diff --git a/tesseract_python/tesseract_viewer_python/CMakeLists.txt b/tesseract_python/tesseract_viewer_python/CMakeLists.txt
@@ -1,5 +1,9 @@
 cmake_minimum_required(VERSION 3.5.0)
-project(tesseract_python_viewer)
+
+# Extract package name and version
+find_package(cmake_common_scripts REQUIRED)
+extract_package_metadata(pkg)
+project(${pkg_extracted_name} VERSION ${pkg_extracted_version})
 
 if(NOT PYTHON_VERSION)
   set(PYTHON_VERSION  $ENV{ROS_PYTHON_VERSION})
diff --git a/tesseract_python/tesseract_viewer_python/package.xml b/tesseract_python/tesseract_viewer_python/package.xml
@@ -7,6 +7,7 @@
   <license>Apache 2.0</license>
   <author >John Wason</author>
   
+  <build_depend>cmake_common_scripts</build_depend>
   <depend>trajopt</depend>
   <depend>tesseract_collision</depend>
   <depend>tesseract_motion_planners</depend>
