Skip to content

Commit eb7b252

Browse files
committed
Remove install block in vendor
Signed-off-by: Jose Luis Rivero <jrivero@honurobotics.com>
1 parent 50b3514 commit eb7b252

File tree

2 files changed

+10
-32
lines changed

2 files changed

+10
-32
lines changed

vendor/backward-cpp/CMakeLists.txt

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -156,21 +156,3 @@ if(BACKWARD_TESTS)
156156
backward_add_test(test/${test}.cpp backward.cpp)
157157
endforeach()
158158
endif()
159-
160-
# check if Backward is being used as a top-level project or included as a subproject
161-
if(CMAKE_SOURCE_DIR STREQUAL PROJECT_SOURCE_DIR)
162-
install(
163-
FILES "backward.hpp"
164-
DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}
165-
)
166-
install(
167-
FILES "BackwardConfig.cmake"
168-
DESTINATION "${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}"
169-
)
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()

vendor/backward-cpp/GAZEBO_MODIFIED_CODE.patch

Lines changed: 10 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ the vendor package. See https://github.com/gazebosim/gz-sim/pull/2838.
66
Upstream PR related: https://github.com/bombela/backward-cpp/pull/338
77

88
On updates, be sure of preserving this patch.
9-
109
diff --git a/vendor/backward-cpp/CMakeLists.txt b/vendor/backward-cpp/CMakeLists.txt
1110
index e625f8ac9..3b18476d5 100644
1211
--- a/vendor/backward-cpp/CMakeLists.txt
@@ -15,6 +14,7 @@ index e625f8ac9..3b18476d5 100644
1514
endforeach()
1615
endif()
1716

17+
-
1818
-install(
1919
- FILES "backward.hpp"
2020
- DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}
@@ -23,16 +23,12 @@ index e625f8ac9..3b18476d5 100644
2323
- FILES "BackwardConfig.cmake"
2424
- DESTINATION "${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}"
2525
-)
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-
+ install(
29-
+ FILES "backward.hpp"
30-
+ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}
31-
+ )
32-
+ install(
33-
+ FILES "BackwardConfig.cmake"
34-
+ DESTINATION "${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}"
35-
+ )
36-
# export the targets (note that exporting backward_object does not make sense)
37-
install(TARGETS backward_interface backward EXPORT BackwardTargets)
38-
# install a CMake file for the exported targets
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()

0 commit comments

Comments
 (0)