Skip to content

simplify boost::stacktrace dependencies #213

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

Merged
flipflip8952 merged 1 commit into from
Aug 5, 2026
Merged

simplify boost::stacktrace dependencies #213

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions docker/ci.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -555,9 +555,9 @@ do_step build_projs_release_noros_mindeps || true # continue

do_step build_examples || true # continue

# Some minimal checks with clang on the reference system (Trixie) and a more recent Ubuntu 26 (= ROS2 Lyrical)
# Not on Noetic/Ubuntu 20, that is just way too ancient...
echo "===== clang ====="
if [ "${FPSDK_IMAGE%-*}" = "trixie" -o "${FPSDK_IMAGE%-*}" = "lyrical" ]; then
if [ "${FPSDK_IMAGE%-*}" = "trixie" -o "${FPSDK_IMAGE%-*}" = "humble" -o "${FPSDK_IMAGE%-*}" = "jazzy" -o "${FPSDK_IMAGE%-*}" = "lyrical" ]; then
do_step build_toplevel_release_clang || true # continue
do_step build_toplevel_debug_clang || true # continue
fi
Expand Down
11 changes: 6 additions & 5 deletions fpsdk_common/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,9 @@ if(NOT CMAKE_BUILD_TYPE STREQUAL "Debug")
add_compile_definitions(NDEBUG)
endif()
if(NOT CMAKE_BUILD_TYPE STREQUAL "Release")
add_compile_definitions(BOOST_STACKTRACE_USE_BACKTRACE)
add_compile_definitions(BOOST_STACKTRACE_USE_ADDR2LINE)
#add_compile_definitions(BOOST_STACKTRACE_USE_BACKTRACE)
#add_compile_definitions(BOOST_STACKTRACE_USE_ADDR2LINE)
add_compile_definitions(BOOST_STACKTRACE_DYN_LINK)
set(FPSDK_BOOST_STACKTRACE 1)
endif()

Expand All @@ -38,11 +39,11 @@ endif()

if(FPSDK_BOOST_STACKTRACE)
if(FPSDK_LEGACY_BOOST_CMAKE) # e.g. Buildroot 2022.08
find_package(Boost REQUIRED COMPONENTS stacktrace_basic stacktrace_backtrace stacktrace_addr2line)
find_package(Boost REQUIRED COMPONENTS stacktrace_backtrace)
else()
find_package(Boost CONFIG REQUIRED COMPONENTS stacktrace_basic stacktrace_backtrace stacktrace_addr2line)
find_package(Boost CONFIG REQUIRED COMPONENTS stacktrace_backtrace)
endif()
set(Boost_TARGETS "Boost::headers;Boost::stacktrace_basic;Boost::stacktrace_backtrace;Boost::stacktrace_addr2line")
set(Boost_TARGETS "Boost::headers;Boost::stacktrace_backtrace")
else()
if(FPSDK_LEGACY_BOOST_CMAKE)
find_package(Boost REQUIRED)
Expand Down
Loading