Skip to content

Commit

Permalink
add iron to CMakeList.txt
Browse files Browse the repository at this point in the history
  • Loading branch information
SamerKhshiboun committed Jun 21, 2023
1 parent 0e89444 commit dfa9899
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 9 deletions.
12 changes: 6 additions & 6 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ jobs:
strategy:
fail-fast: false
matrix:
ros_distro: [rolling, humble, galactic, foxy]
ros_distro: [rolling, humble, iron]
include:
- ros_distro: 'rolling'
os: ubuntu-22.04
Expand Down Expand Up @@ -52,13 +52,13 @@ jobs:
# cmake 3.24.0 is not compaitable with galactic/foxy/humble ament_cmake
# see: https://github.com/ament/ament_cmake/pull/395
# TODO: remove this step once ament_cmake for galactic/foxy/humble is released
- name: Setup cmake 3.23.0
uses: jwlawson/[email protected]
with:
cmake-version: '3.23.0'
# - name: Setup cmake 3.23.0
# uses: jwlawson/[email protected]
# with:
# cmake-version: '3.23.0'

- name: build ROS2
uses: ros-tooling/setup-ros@v0.3
uses: ros-tooling/setup-ros@v0.6
with:
required-ros-distributions: ${{ matrix.ros_distro }}

Expand Down
4 changes: 1 addition & 3 deletions .github/workflows/pre-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,12 +31,10 @@ jobs:
strategy:
fail-fast: false
matrix:
ros_distro: [humble, iron]
ros_distro: [humble]
include:
- ros_distro: 'humble'
os: ubuntu-22.04
- ros_distro: 'iron'
os: ubuntu-22.04

env:
ROS_DISTRO: ${{ matrix.ros_distro }}
Expand Down
4 changes: 4 additions & 0 deletions realsense2_camera/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -164,6 +164,10 @@ elseif("$ENV{ROS_DISTRO}" STREQUAL "humble")
message(STATUS "Build for ROS2 Humble")
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DHUMBLE")
set(SOURCES "${SOURCES}" src/ros_param_backend_foxy.cpp)
elseif("$ENV{ROS_DISTRO}" STREQUAL "iron")
message(STATUS "Build for ROS2 Iron")
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DIRON")
set(SOURCES "${SOURCES}" src/ros_param_backend_foxy.cpp)
elseif("$ENV{ROS_DISTRO}" STREQUAL "rolling")
message(STATUS "Build for ROS2 Rolling")
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DROLLING")
Expand Down

0 comments on commit dfa9899

Please sign in to comment.