update
This commit is contained in:
Submodule src/Libraries/costmap_2d updated: 59b0b1a806...71adf1390f
Submodule src/Libraries/robot_cpp updated: dc9362cb0b...cb9dfe5c9b
@@ -12,8 +12,8 @@ set(CMAKE_POSITION_INDEPENDENT_CODE ON)
|
||||
# Find dependencies
|
||||
find_package(console_bridge REQUIRED)
|
||||
find_package(Boost REQUIRED COMPONENTS system thread)
|
||||
find_package(xmlrpcpp QUIET)
|
||||
if(NOT xmlrpcpp_FOUND)
|
||||
find_package(robot_xmlrpcpp QUIET)
|
||||
if(NOT robot_xmlrpcpp_FOUND)
|
||||
# Try alternative package name
|
||||
find_package(XmlRpcCpp QUIET)
|
||||
endif()
|
||||
@@ -63,21 +63,21 @@ target_include_directories(polygons
|
||||
$<INSTALL_INTERFACE:include>
|
||||
)
|
||||
|
||||
if(xmlrpcpp_FOUND)
|
||||
target_include_directories(polygons PRIVATE ${xmlrpcpp_INCLUDE_DIRS})
|
||||
if(robot_xmlrpcpp_FOUND)
|
||||
target_include_directories(polygons PRIVATE ${robot_xmlrpcpp_INCLUDE_DIRS})
|
||||
target_link_libraries(polygons
|
||||
PUBLIC robot_nav_2d_msgs geometry_msgs robot_cpp
|
||||
PRIVATE ${xmlrpcpp_LIBRARIES})
|
||||
PRIVATE ${robot_xmlrpcpp_LIBRARIES})
|
||||
elseif(XmlRpcCpp_FOUND)
|
||||
target_include_directories(polygons PRIVATE ${XmlRpcCpp_INCLUDE_DIRS})
|
||||
target_link_libraries(polygons
|
||||
PUBLIC robot_nav_2d_msgs geometry_msgs robot_cpp
|
||||
PRIVATE ${XmlRpcCpp_LIBRARIES})
|
||||
else()
|
||||
target_include_directories(polygons PRIVATE ${xmlrpcpp_INCLUDE_DIRS})
|
||||
target_include_directories(polygons PRIVATE ${robot_xmlrpcpp_INCLUDE_DIRS})
|
||||
target_link_libraries(polygons
|
||||
PUBLIC robot_nav_2d_msgs geometry_msgs robot_cpp
|
||||
PRIVATE ${xmlrpcpp_LIBRARIES})
|
||||
PRIVATE ${robot_xmlrpcpp_LIBRARIES})
|
||||
endif()
|
||||
|
||||
set_target_properties(polygons PROPERTIES
|
||||
|
||||
@@ -38,7 +38,7 @@
|
||||
#include <robot_nav_2d_msgs/Polygon2D.h>
|
||||
#include <robot_nav_2d_msgs/ComplexPolygon2D.h>
|
||||
#include <geometry_msgs/Pose2D.h>
|
||||
#include <xmlrpcpp/XmlRpcValue.h>
|
||||
#include <robot_xmlrpcpp/XmlRpcValue.h>
|
||||
#include <vector>
|
||||
#include <string>
|
||||
|
||||
|
||||
Submodule src/Libraries/xmlrpcpp deleted from 5bdd606fff
Reference in New Issue
Block a user