Skip to content

Commit bdead33

Browse files
author
Levi Armstrong
committed
Update cmake_common_scripts to ros_industrial_cmake_boilerplate
1 parent 0466e23 commit bdead33

File tree

9 files changed

+12
-12
lines changed

9 files changed

+12
-12
lines changed

.github/workflows/bionic_build.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919
ROS_DISTRO: melodic
2020
ROS_REPO: main
2121
UPSTREAM_WORKSPACE: 'dependencies.rosinstall'
22-
ROSDEP_SKIP_KEYS: "bullet bullet-extras cmake_common_scripts iwyu fcl taskflow"
22+
ROSDEP_SKIP_KEYS: "bullet bullet-extras ros_industrial_cmake_boilerplate iwyu fcl taskflow"
2323
DOCKER_IMAGE: "rosindustrial/tesseract:melodic"
2424
CCACHE_DIR: "/home/runner/work/tesseract_python/tesseract_python/Bionic-Build/.ccache"
2525
PARALLEL_BUILDS: false

.github/workflows/focal_build.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919
ROS_DISTRO: noetic
2020
ROS_REPO: main
2121
UPSTREAM_WORKSPACE: 'dependencies.rosinstall'
22-
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"
22+
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"
2323
DOCKER_IMAGE: "rosindustrial/tesseract:noetic"
2424
CCACHE_DIR: "/home/runner/work/tesseract_python/tesseract_python/Focal-Build/.ccache"
2525
PARALLEL_TESTS: false

.github/workflows/nightly.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ jobs:
2121
ROS_DISTRO: melodic,
2222
ROS_REPO: main,
2323
UPSTREAM_WORKSPACE: 'dependencies.rosinstall',
24-
ROSDEP_SKIP_KEYS: "bullet bullet-extras cmake_common_scripts fcl iwyu",
24+
ROSDEP_SKIP_KEYS: "bullet bullet-extras ros_industrial_cmake_boilerplate fcl iwyu",
2525
DOCKER_IMAGE: "rosindustrial/tesseract:melodic",
2626
CCACHE_DIR: "/home/runner/work/tesseract_python/tesseract_python/Bionic-Build-Nightly/.ccache",
2727
PARALLEL_TESTS: false,
@@ -34,7 +34,7 @@ jobs:
3434
ROS_DISTRO: noetic,
3535
ROS_REPO: main,
3636
UPSTREAM_WORKSPACE: 'dependencies.rosinstall',
37-
ROSDEP_SKIP_KEYS: "bullet bullet-extras cmake_common_scripts fcl iwyu benchmark",
37+
ROSDEP_SKIP_KEYS: "bullet bullet-extras ros_industrial_cmake_boilerplat fcl iwyu benchmark",
3838
DOCKER_IMAGE: "rosindustrial/tesseract:noetic",
3939
CCACHE_DIR: "/home/runner/work/tesseract_python/tesseract_python/Focal-Build-Nightly/.ccache",
4040
UPSTREAM_CMAKE_ARGS: "-DCMAKE_BUILD_TYPE=Release",

dependencies.rosinstall

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
- git:
2-
local-name: cmake_common_scripts
3-
uri: https://github.com/ros-industrial/cmake_common_scripts.git
2+
local-name: ros_industrial_cmake_boilerplate
3+
uri: https://github.com/ros-industrial/ros_industrial_cmake_boilerplate.git
44
version: master
55
- git:
66
local-name: tesseract

dependencies_with_ext.rosinstall

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
- git:
2-
local-name: cmake_common_scripts
3-
uri: https://github.com/ros-industrial/cmake_common_scripts.git
2+
local-name: ros_industrial_cmake_boilerplate
3+
uri: https://github.com/ros-industrial/ros_industrial_cmake_boilerplate.git
44
version: master
55
- git:
66
local-name: tesseract_ext

tesseract_python/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
cmake_minimum_required(VERSION 3.5.0)
22

33
# Extract package name and version
4-
find_package(cmake_common_scripts REQUIRED)
4+
find_package(ros_industrial_cmake_boilerplate REQUIRED)
55
extract_package_metadata(pkg)
66
project(${pkg_extracted_name} VERSION ${pkg_extracted_version})
77

tesseract_python/package.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
<exec_depend>catkin</exec_depend>
1212
<buildtool_depend>cmake</buildtool_depend>
1313

14-
<build_depend>cmake_common_scripts</build_depend>
14+
<build_depend>ros_industrial_cmake_boilerplate</build_depend>
1515
<depend>trajopt</depend>
1616
<depend>tesseract_motion_planners</depend>
1717
<depend>tesseract_common</depend>

tesseract_viewer_python/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
cmake_minimum_required(VERSION 3.5.0)
22

33
# Extract package name and version
4-
find_package(cmake_common_scripts REQUIRED)
4+
find_package(ros_industrial_cmake_boilerplate REQUIRED)
55
extract_package_metadata(pkg)
66
project(${pkg_extracted_name} VERSION ${pkg_extracted_version})
77

tesseract_viewer_python/package.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
<exec_depend>catkin</exec_depend>
1212
<buildtool_depend>cmake</buildtool_depend>
1313

14-
<build_depend>cmake_common_scripts</build_depend>
14+
<build_depend>ros_industrial_cmake_boilerplate</build_depend>
1515
<depend>trajopt</depend>
1616
<depend>tesseract_collision</depend>
1717
<depend>tesseract_motion_planners</depend>

0 commit comments

Comments
 (0)