Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit 0dd9ac2

Browse files
Merge pull request BehaviorTree#55 from v-lopez/avoid-duplicate-backward
If backward_ros is present, use it to avoid duplicate symbols
2 parents 06d753b + b751232 commit 0dd9ac2

File tree

1 file changed

+10
-1
lines changed

1 file changed

+10
-1
lines changed

CMakeLists.txt

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,6 +74,12 @@ elseif( CATKIN_DEVEL_PREFIX OR CATKIN_BUILD_BINARY_PACKAGE)
7474
list(APPEND BEHAVIOR_TREE_EXTERNAL_LIBRARIES ${catkin_LIBRARIES})
7575
set(BUILD_TOOL_INCLUDE_DIRS ${catkin_INCLUDE_DIRS})
7676

77+
find_package(backward_ros QUIET)
78+
if (backward_ros_FOUND)
79+
message(STATUS "backward_ros found, using it.")
80+
list(APPEND BEHAVIOR_TREE_EXTERNAL_LIBRARIES ${catkin_LIBRARIES} ${backward_ros_LIBRARIES})
81+
endif()
82+
7783
else()
7884
find_package(GTest)
7985

@@ -125,8 +131,11 @@ list(APPEND BT_SOURCE
125131

126132
3rdparty/tinyXML2/tinyxml2.cpp
127133
3rdparty/minitrace/minitrace.cpp
128-
3rdparty/backward-cpp/backward.cpp
129134
)
135+
if (NOT backward_ros_FOUND)
136+
list(APPEND BT_SOURCE
137+
3rdparty/backward-cpp/backward.cpp)
138+
endif()
130139

131140
######################################################
132141

0 commit comments

Comments
 (0)