Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix ROS 2 RHEL build #2119

Merged
merged 2 commits into from
Dec 4, 2023
Merged

Fix ROS 2 RHEL build #2119

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7a1be0d
iox-#2099 Skip the introspection build if the curses library is not f…
mossmaurice Nov 28, 2023
e0936f1
iox-#2099 Update ROS 2 toolchain to latest release
mossmaurice Dec 4, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/build-test.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ jobs:
needs: pre-flight-check
steps:
- name: Setup ROS
uses: ros-tooling/setup-ros@v0.6
uses: ros-tooling/setup-ros@v0.7
with:
required-ros-distributions: humble
- uses: actions/checkout@v3
Expand Down
21 changes: 8 additions & 13 deletions tools/introspection/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,12 +21,6 @@ set(IOX_VERSION_STRING "2.90.0")

project(iceoryx_introspection VERSION ${IOX_VERSION_STRING})

# Do not build the introspection on Windows due to missing ncurses
if(WIN32)
message(STATUS "The introspection client is not supported on Windows")
return()
endif()

find_package(iceoryx_platform REQUIRED)
find_package(iceoryx_hoofs REQUIRED)
find_package(iceoryx_posh REQUIRED)
Expand All @@ -41,14 +35,15 @@ if(CMAKE_SYSTEM_NAME MATCHES Linux OR CMAKE_SYSTEM_NAME MATCHES Darwin)
option(BUILD_SHARED_LIBS "Create shared libraries by default" ON)
endif()

# cmake doesn't find ncurses under QNX; let the compiler complain if the header is missing
if(NOT QNX)
SET(CURSES_USE_NCURSES TRUE)
find_package(Curses REQUIRED)
if(${CURSES_HAVE_NCURSES_H} MATCHES ".*-NOTFOUND")
message(SEND_ERROR "ncurses header not found! Please install libncurses5-dev!")
endif(${CURSES_HAVE_NCURSES_H} MATCHES ".*-NOTFOUND")
SET(CURSES_USE_NCURSES TRUE)
find_package(Curses QUIET)
if(NOT CURSES_FOUND)
message(STATUS "The build of the introspection client is skipped due to missing the curses library")
return()
endif()
if(${CURSES_HAVE_NCURSES_H} MATCHES ".*-NOTFOUND")
message(SEND_ERROR "ncurses header not found! Please install libncurses5-dev!")
endif(${CURSES_HAVE_NCURSES_H} MATCHES ".*-NOTFOUND")

iox_add_library(
TARGET iceoryx_introspection
Expand Down