Merge pull request #5 from Levi-Armstrong/update/CmakeCommonScriptsRename

Update cmake_common_scripts to ros_industrial_cmake_boilerplate

Author: johnwason

.github/workflows/bionic_build.yml

@@ -19,7 +19,7 @@ jobs:
       ROS_DISTRO: melodic
       ROS_REPO: main
       UPSTREAM_WORKSPACE: 'dependencies.rosinstall'
-      ROSDEP_SKIP_KEYS: "bullet bullet-extras cmake_common_scripts iwyu fcl taskflow"
+      ROSDEP_SKIP_KEYS: "bullet bullet-extras ros_industrial_cmake_boilerplate iwyu fcl taskflow"
       DOCKER_IMAGE: "rosindustrial/tesseract:melodic"
       CCACHE_DIR: "/home/runner/work/tesseract_python/tesseract_python/Bionic-Build/.ccache"
       PARALLEL_BUILDS: false

.github/workflows/focal_build.yml

@@ -19,12 +19,12 @@ jobs:
       ROS_DISTRO: noetic
       ROS_REPO: main
       UPSTREAM_WORKSPACE: 'dependencies.rosinstall'
-      ROSDEP_SKIP_KEYS: "bullet bullet-extras fcl ompl orocos_kdl python-numpy ifopt python descartes_opw descartes_samplers descartes_light opw_kinematics cmake_common_scripts iwyu taskflow"
+      ROSDEP_SKIP_KEYS: "bullet bullet-extras fcl ompl orocos_kdl python-numpy ifopt python descartes_opw descartes_samplers descartes_light opw_kinematics ros_industrial_cmake_boilerplate iwyu taskflow"
       DOCKER_IMAGE: "rosindustrial/tesseract:noetic"
       CCACHE_DIR: "/home/runner/work/tesseract_python/tesseract_python/Focal-Build/.ccache"
       PARALLEL_TESTS: false
       PARALLEL_BUILDS: false
-      BEFORE_RUN_TARGET_TEST_EMBED: "source /root/target_ws/install/setup.bash"
+      BEFORE_RUN_TARGET_TEST_EMBED: "ici_with_unset_variables source /root/target_ws/install/setup.bash"
       UPSTREAM_CMAKE_ARGS: "-DCMAKE_BUILD_TYPE=Release"
       TARGET_CMAKE_ARGS: "-DCMAKE_BUILD_TYPE=Debug -DTESSERACT_ENABLE_TESTING=ON"
     steps:

.github/workflows/nightly.yml

@@ -21,7 +21,7 @@ jobs:
              ROS_DISTRO: melodic,
              ROS_REPO: main,
              UPSTREAM_WORKSPACE: 'dependencies.rosinstall',
-             ROSDEP_SKIP_KEYS: "bullet bullet-extras cmake_common_scripts fcl iwyu",
+             ROSDEP_SKIP_KEYS: "bullet bullet-extras ros_industrial_cmake_boilerplate fcl iwyu",
              DOCKER_IMAGE: "rosindustrial/tesseract:melodic",
              CCACHE_DIR: "/home/runner/work/tesseract_python/tesseract_python/Bionic-Build-Nightly/.ccache",
              PARALLEL_TESTS: false,
@@ -34,7 +34,7 @@ jobs:
              ROS_DISTRO: noetic,
              ROS_REPO: main,
              UPSTREAM_WORKSPACE: 'dependencies.rosinstall',
-             ROSDEP_SKIP_KEYS: "bullet bullet-extras cmake_common_scripts fcl iwyu benchmark",
+             ROSDEP_SKIP_KEYS: "bullet bullet-extras ros_industrial_cmake_boilerplat fcl iwyu benchmark",
              DOCKER_IMAGE: "rosindustrial/tesseract:noetic",
              CCACHE_DIR: "/home/runner/work/tesseract_python/tesseract_python/Focal-Build-Nightly/.ccache",
              UPSTREAM_CMAKE_ARGS: "-DCMAKE_BUILD_TYPE=Release",

dependencies.rosinstall

@@ -1,6 +1,6 @@
 - git:
-    local-name: cmake_common_scripts
-    uri: https://github.com/ros-industrial/cmake_common_scripts.git
+    local-name: ros_industrial_cmake_boilerplate
+    uri: https://github.com/ros-industrial/ros_industrial_cmake_boilerplate.git
     version: master
 - git:
     local-name: tesseract

dependencies_with_ext.rosinstall

@@ -1,6 +1,6 @@
 - git:
-    local-name: cmake_common_scripts
-    uri: https://github.com/ros-industrial/cmake_common_scripts.git
+    local-name: ros_industrial_cmake_boilerplate
+    uri: https://github.com/ros-industrial/ros_industrial_cmake_boilerplate.git
     version: master
 - git:
     local-name: tesseract_ext

tesseract_python/CMakeLists.txt

@@ -1,7 +1,7 @@
 cmake_minimum_required(VERSION 3.5.0)
 
 # Extract package name and version
-find_package(cmake_common_scripts REQUIRED)
+find_package(ros_industrial_cmake_boilerplate REQUIRED)
 extract_package_metadata(pkg)
 project(${pkg_extracted_name} VERSION ${pkg_extracted_version})
 

tesseract_python/package.xml

@@ -11,7 +11,7 @@
   <exec_depend>catkin</exec_depend>
   <buildtool_depend>cmake</buildtool_depend>
 
-  <build_depend>cmake_common_scripts</build_depend>
+  <build_depend>ros_industrial_cmake_boilerplate</build_depend>
   <depend>trajopt</depend>
   <depend>tesseract_motion_planners</depend>
   <depend>tesseract_common</depend>

tesseract_viewer_python/CMakeLists.txt

@@ -1,7 +1,7 @@
 cmake_minimum_required(VERSION 3.5.0)
 
 # Extract package name and version
-find_package(cmake_common_scripts REQUIRED)
+find_package(ros_industrial_cmake_boilerplate REQUIRED)
 extract_package_metadata(pkg)
 project(${pkg_extracted_name} VERSION ${pkg_extracted_version})
 

tesseract_viewer_python/package.xml

@@ -11,7 +11,7 @@
   <exec_depend>catkin</exec_depend>
   <buildtool_depend>cmake</buildtool_depend>
 
-  <build_depend>cmake_common_scripts</build_depend>
+  <build_depend>ros_industrial_cmake_boilerplate</build_depend>
   <depend>trajopt</depend>
   <depend>tesseract_collision</depend>
   <depend>tesseract_motion_planners</depend>