Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
3 changes: 3 additions & 0 deletions Changelog.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,9 @@

1. **Baseline:** this includes all changes from 9.3.0 and earlier.

1. Don't install vendored backward files
* [Pull request #3088](https://github.com/gazebosim/gz-sim/pull/3088)

1. Add missing dependencies to package.xml
* [Pull request #3093](https://github.com/gazebosim/gz-sim/pull/3093)

Expand Down
18 changes: 0 additions & 18 deletions vendor/backward-cpp/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -156,21 +156,3 @@ if(BACKWARD_TESTS)
backward_add_test(test/${test}.cpp backward.cpp)
endforeach()
endif()

install(
FILES "backward.hpp"
DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}
)
install(
FILES "BackwardConfig.cmake"
DESTINATION "${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}"
)
# check if Backward is being used as a top-level project or included as a subproject
if(CMAKE_SOURCE_DIR STREQUAL PROJECT_SOURCE_DIR)
# export the targets (note that exporting backward_object does not make sense)
install(TARGETS backward_interface backward EXPORT BackwardTargets)
# install a CMake file for the exported targets
install(EXPORT BackwardTargets
NAMESPACE Backward::
DESTINATION "${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}")
endif()
34 changes: 34 additions & 0 deletions vendor/backward-cpp/GAZEBO_MODIFIED_CODE.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
Summary: avoid installing backwards file in the system unless being
used as a top level

Description: do not install backwards files in the Gazebo usage of
the vendor package. See https://github.com/gazebosim/gz-sim/pull/2838.
Upstream PR related: https://github.com/bombela/backward-cpp/pull/338

On updates, be sure of preserving this patch.
diff --git a/vendor/backward-cpp/CMakeLists.txt b/vendor/backward-cpp/CMakeLists.txt
index e625f8ac9..3b18476d5 100644
--- a/vendor/backward-cpp/CMakeLists.txt
+++ b/vendor/backward-cpp/CMakeLists.txt
@@ -157,16 +157,16 @@ if(BACKWARD_TESTS)
endforeach()
endif()

-
-install(
- FILES "backward.hpp"
- DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}
-)
-install(
- FILES "BackwardConfig.cmake"
- DESTINATION "${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}"
-)
-# check if Backward is being used as a top-level project or included as a subproject
-if(CMAKE_SOURCE_DIR STREQUAL PROJECT_SOURCE_DIR)
- # export the targets (note that exporting backward_object does not make sense)
- install(TARGETS backward_interface backward EXPORT BackwardTargets)
- # install a CMake file for the exported targets
- install(EXPORT BackwardTargets
- NAMESPACE Backward::
- DESTINATION "${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}")
-endif()
Loading