File tree Expand file tree Collapse file tree 3 files changed +37
-18
lines changed Expand file tree Collapse file tree 3 files changed +37
-18
lines changed Original file line number Diff line number Diff line change 44
551 . ** Baseline:** this includes all changes from 9.3.0 and earlier.
66
7+ 1 . Don't install vendored backward files
8+ * [ Pull request #3088 ] ( https://github.com/gazebosim/gz-sim/pull/3088 )
9+
7101 . Add missing dependencies to package.xml
811 * [ Pull request #3093 ] ( https://github.com/gazebosim/gz-sim/pull/3093 )
912
Original file line number Diff line number Diff line change @@ -156,21 +156,3 @@ if(BACKWARD_TESTS)
156156 backward_add_test(test /${test} .cpp backward.cpp)
157157 endforeach ()
158158endif ()
159-
160- install (
161- FILES "backward.hpp"
162- DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}
163- )
164- install (
165- FILES "BackwardConfig.cmake"
166- DESTINATION "${CMAKE_INSTALL_LIBDIR} /cmake/${PROJECT_NAME} "
167- )
168- # check if Backward is being used as a top-level project or included as a subproject
169- if (CMAKE_SOURCE_DIR STREQUAL PROJECT_SOURCE_DIR )
170- # export the targets (note that exporting backward_object does not make sense)
171- install (TARGETS backward_interface backward EXPORT BackwardTargets)
172- # install a CMake file for the exported targets
173- install (EXPORT BackwardTargets
174- NAMESPACE Backward::
175- DESTINATION "${CMAKE_INSTALL_LIBDIR} /cmake/${PROJECT_NAME} " )
176- endif ()
Original file line number Diff line number Diff line change 1+ Summary: avoid installing backwards file in the system unless being
2+ used as a top level
3+
4+ Description: do not install backwards files in the Gazebo usage of
5+ the vendor package. See https://github.com/gazebosim/gz-sim/pull/2838.
6+ Upstream PR related: https://github.com/bombela/backward-cpp/pull/338
7+
8+ On updates, be sure of preserving this patch.
9+ diff --git a/vendor/backward-cpp/CMakeLists.txt b/vendor/backward-cpp/CMakeLists.txt
10+ index e625f8ac9..3b18476d5 100644
11+ --- a/vendor/backward-cpp/CMakeLists.txt
12+ +++ b/vendor/backward-cpp/CMakeLists.txt
13+ @@ -157,16 +157,16 @@ if(BACKWARD_TESTS)
14+ endforeach()
15+ endif()
16+
17+ -
18+ - install(
19+ - FILES "backward.hpp"
20+ - DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}
21+ - )
22+ - install(
23+ - FILES "BackwardConfig.cmake"
24+ - DESTINATION "${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}"
25+ - )
26+ - # check if Backward is being used as a top-level project or included as a subproject
27+ - if(CMAKE_SOURCE_DIR STREQUAL PROJECT_SOURCE_DIR)
28+ - # export the targets (note that exporting backward_object does not make sense)
29+ - install(TARGETS backward_interface backward EXPORT BackwardTargets)
30+ - # install a CMake file for the exported targets
31+ - install(EXPORT BackwardTargets
32+ - NAMESPACE Backward::
33+ - DESTINATION "${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}")
34+ - endif()
You can’t perform that action at this time.
0 commit comments