bkinnightskytw
/
kdl_parser
mirror of https://github.com/existedinnettw/kdl_parser.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #106 from k-okada/add_pcre_cpp/urdf 

add libpcrecpp, without this patch, pcrecpp always fails > 13.04
This commit is contained in:
Ioan A Sucan 2015-04-22 09:35:52 -07:00
parent 210654ace6 d18dc62f81
commit 8ec25f3c06
3 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
urdf/CMakeLists.txt
View File

@ -10,11 +10,14 @@ find_package(catkin REQUIRED COMPONENTS
find_package(TinyXML REQUIRED) find_package(TinyXML REQUIRED)
find_package(PkgConfig)
pkg_check_modules(libpcrecpp libpcrecpp)
catkin_package( catkin_package(
LIBRARIES ${PROJECT_NAME} LIBRARIES ${PROJECT_NAME}
INCLUDE_DIRS include ${TinyXML_INCLUDE_DIRS} INCLUDE_DIRS include ${TinyXML_INCLUDE_DIRS}
CATKIN_DEPENDS rosconsole_bridge roscpp CATKIN_DEPENDS rosconsole_bridge roscpp
DEPENDS urdfdom_headers urdfdom Boost DEPENDS urdfdom_headers urdfdom Boost pcrecpp
) )
include_directories(SYSTEM ${Boost_INCLUDE_DIR}) include_directories(SYSTEM ${Boost_INCLUDE_DIR})
@ -30,7 +33,7 @@ include_directories(
link_directories(${catkin_LIBRARY_DIRS}) link_directories(${catkin_LIBRARY_DIRS})
add_library(${PROJECT_NAME} src/model.cpp src/rosconsole_bridge.cpp) add_library(${PROJECT_NAME} src/model.cpp src/rosconsole_bridge.cpp)
target_link_libraries(${PROJECT_NAME} ${TinyXML_LIBRARIES} ${catkin_LIBRARIES} ${urdfdom_LIBRARIES}) target_link_libraries(${PROJECT_NAME} ${TinyXML_LIBRARIES} ${catkin_LIBRARIES} ${urdfdom_LIBRARIES} ${libpcrecpp_LIBRARIES})
if(APPLE) if(APPLE)
set_target_properties(${PROJECT_NAME} PROPERTIES LINK_FLAGS "-undefined dynamic_lookup") set_target_properties(${PROJECT_NAME} PROPERTIES LINK_FLAGS "-undefined dynamic_lookup")

2
urdf/package.xml
View File

@ -23,6 +23,7 @@
<build_depend>liburdfdom-headers-dev</build_depend> <build_depend>liburdfdom-headers-dev</build_depend>
<build_depend>rosconsole_bridge</build_depend> <build_depend>rosconsole_bridge</build_depend>
<build_depend>roscpp</build_depend> <build_depend>roscpp</build_depend>
<build_depend>pcre</build_depend>
<build_depend>urdf_parser_plugin</build_depend> <build_depend>urdf_parser_plugin</build_depend>
<build_depend>pluginlib</build_depend> <build_depend>pluginlib</build_depend>
<build_depend>cmake_modules</build_depend> <build_depend>cmake_modules</build_depend>
@ -32,6 +33,7 @@
<run_depend>liburdfdom-headers-dev</run_depend> <run_depend>liburdfdom-headers-dev</run_depend>
<run_depend>rosconsole_bridge</run_depend> <run_depend>rosconsole_bridge</run_depend>
<run_depend>roscpp</run_depend> <run_depend>roscpp</run_depend>
<run_depend>pcre</run_depend>
<run_depend>urdf_parser_plugin</run_depend> <run_depend>urdf_parser_plugin</run_depend>
<run_depend>pluginlib</run_depend> <run_depend>pluginlib</run_depend>

3
urdf/src/model.cpp
View File

@ -52,6 +52,9 @@
#include <fstream> #include <fstream>
#include <iostream> #include <iostream>
#include <pcrecpp.h>
pcrecpp::RE __re__("");
namespace urdf{ namespace urdf{
static bool IsColladaData(const std::string& data) static bool IsColladaData(const std::string& data)