Skip to content

Commit

Permalink
Merge pull request #2119 from ApexAI/iox-#2099-fix-ros-2-rhel-build-m…
Browse files Browse the repository at this point in the history
…aster

Fix ROS 2 RHEL build
  • Loading branch information
mossmaurice authored Dec 4, 2023
2 parents 55dffd6 + e0936f1 commit 88a96c8
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 14 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/build-test.yml
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
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

0 comments on commit 88a96c8

Please sign in to comment.