Update cmake_common_scripts to ros_industrial_cmake_boilerplate

Jmeyer1292 · Jan 27, 2021 · b361e54 · b361e54
1 parent 27981bb
commit b361e54
Show file tree

Hide file tree

Showing 7 changed files with 11 additions and 11 deletions.
diff --git a/.github/workflows/bionic_build.yml b/.github/workflows/bionic_build.yml
@@ -18,8 +18,8 @@ jobs:
       OS_CODE_NAME: bionic
       ROS_DISTRO: melodic
       ROS_REPO: main
-      TARGET_WORKSPACE: '. github:ros-industrial/cmake_common_scripts#master'
-      ROSDEP_SKIP_KEYS: "iwyu cmake_common_scripts"
+      UPSTREAM_WORKSPACE: 'dependencies.rosinstall'
+      ROSDEP_SKIP_KEYS: "iwyu ros_industrial_cmake_boilerplate"
       CCACHE_DIR: "/home/runner/work/opw_kinematics/opw_kinematics/Bionic-Build/.ccache"
       TARGET_CMAKE_ARGS: "-DCMAKE_BUILD_TYPE=Debug -DOPW_ENABLE_TESTING=ON"
       AFTER_SCRIPT: 'catkin build -w $target_ws --no-deps --verbose opw_kinematics --make-args test'

diff --git a/.github/workflows/focal_build.yml b/.github/workflows/focal_build.yml
@@ -18,8 +18,8 @@ jobs:
       OS_CODE_NAME: focal
       ROS_DISTRO: noetic
       ROS_REPO: main
-      TARGET_WORKSPACE: '. github:ros-industrial/cmake_common_scripts#master'
-      ROSDEP_SKIP_KEYS: "iwyu cmake_common_scripts"
+      UPSTREAM_WORKSPACE: 'dependencies.rosinstall'
+      ROSDEP_SKIP_KEYS: "iwyu ros_industrial_cmake_boilerplate"
       CCACHE_DIR: "/home/runner/work/opw_kinematics/opw_kinematics/Focal-Build/.ccache"
       BEFORE_RUN_TARGET_TEST_EMBED: "ici_with_unset_variables source /root/target_ws/install/setup.bash"
       TARGET_CMAKE_ARGS: "-DCMAKE_BUILD_TYPE=Debug -DOPW_ENABLE_TESTING=ON"

diff --git a/.github/workflows/xenial_build.yml b/.github/workflows/xenial_build.yml
@@ -18,8 +18,8 @@ jobs:
       OS_CODE_NAME: xenial
       ROS_DISTRO: kinetic
       ROS_REPO: main
-      TARGET_WORKSPACE: '. github:ros-industrial/cmake_common_scripts#master'
-      ROSDEP_SKIP_KEYS: "iwyu cmake_common_scripts"
+      UPSTREAM_WORKSPACE: 'dependencies.rosinstall'
+      ROSDEP_SKIP_KEYS: "iwyu ros_industrial_cmake_boilerplate"
       CCACHE_DIR: "/home/runner/work/opw_kinematics/opw_kinematics/Xenial-Build/.ccache"
       TARGET_CMAKE_ARGS: "-DCMAKE_BUILD_TYPE=Debug -DOPW_ENABLE_TESTING=ON"
       AFTER_SCRIPT: 'catkin build -w $target_ws --no-deps --verbose opw_kinematics --make-args test'

diff --git a/CHANGELOG.rst b/CHANGELOG.rst
@@ -15,7 +15,7 @@ Changelog for package opw_kinematics
 * Increase version to 0.2.0
 * Add github actions
 * Add code coverage to targets
-* Add cmake_common_scripts
+* Add ros_industrial_cmake_boilerplate
 * Contributors: Levi Armstrong, Matthew Powelson
 
 0.1.0 (2020-02-06)

diff --git a/CMakeLists.txt b/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} LANGUAGES CXX)
 

diff --git a/dependencies.rosinstall b/dependencies.rosinstall
@@ -1,4 +1,4 @@
 - 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
diff --git a/package.xml b/package.xml
@@ -16,7 +16,7 @@
   <license>Apache 2.0</license>
 
   <buildtool_depend>cmake</buildtool_depend>
-  <build_depend>cmake_common_scripts</build_depend>
+  <build_depend>ros_industrial_cmake_boilerplate</build_depend>
   <depend>eigen</depend>
   <test_depend>gtest</test_depend>