merge
This commit is contained in:
commit
91fea0668f
|
@ -4,6 +4,8 @@ set(ROS_BUILD_TYPE RelWithDebInfo)
|
||||||
rosbuild_init()
|
rosbuild_init()
|
||||||
set(EXECUTABLE_OUTPUT_PATH ${PROJECT_SOURCE_DIR}/bin)
|
set(EXECUTABLE_OUTPUT_PATH ${PROJECT_SOURCE_DIR}/bin)
|
||||||
|
|
||||||
|
link_libraries(tinyxml)
|
||||||
|
|
||||||
rosbuild_add_library(collada_urdf src/collada_urdf.cpp)
|
rosbuild_add_library(collada_urdf src/collada_urdf.cpp)
|
||||||
rosbuild_link_boost(collada_urdf system)
|
rosbuild_link_boost(collada_urdf system)
|
||||||
|
|
||||||
|
|
|
@ -23,6 +23,8 @@ set(LIBRARY_OUTPUT_PATH ${PROJECT_SOURCE_DIR}/lib)
|
||||||
#uncomment if you have defined services
|
#uncomment if you have defined services
|
||||||
#rosbuild_gensrv()
|
#rosbuild_gensrv()
|
||||||
|
|
||||||
|
link_libraries(tinyxml)
|
||||||
|
|
||||||
rosbuild_add_library(${PROJECT_NAME} src/kdl_parser.cpp)
|
rosbuild_add_library(${PROJECT_NAME} src/kdl_parser.cpp)
|
||||||
|
|
||||||
rosbuild_add_executable(check_kdl_parser src/check_kdl_parser.cpp )
|
rosbuild_add_executable(check_kdl_parser src/check_kdl_parser.cpp )
|
||||||
|
|
|
@ -3,6 +3,6 @@ pcre:
|
||||||
fedora: pcre-devel
|
fedora: pcre-devel
|
||||||
debian: libpcre3-dev
|
debian: libpcre3-dev
|
||||||
osxbrew:
|
osxbrew:
|
||||||
lion:
|
homebrew:
|
||||||
homebrew:
|
packages: [ pcre++]
|
||||||
packages: [ pcre++]
|
|
||||||
|
|
Loading…
Reference in New Issue