fix install target locations

This commit is contained in:
Ioan Sucan 2012-11-05 21:44:14 +02:00
parent 5da449bdc4
commit d9466df01d
15 changed files with 25 additions and 28 deletions

View File

@ -1 +0,0 @@
include $(shell rospack find mk)/cmake_stack.mk

View File

@ -45,7 +45,7 @@ else()
endif() endif()
install(TARGETS ${PROJECT_NAME} install(TARGETS ${PROJECT_NAME}
DESTINATION lib) DESTINATION ${CATKIN_PACKAGE_LIB_DESTINATION})
install(DIRECTORY include/ install(DIRECTORY include/
DESTINATION include) DESTINATION ${CATKIN_PACKAGE_INCLUDE_DESTINATION})

View File

@ -1,6 +1,6 @@
<package> <package>
<name>collada_parser</name> <name>collada_parser</name>
<version>1.9.25</version> <version>1.9.26</version>
<description> <description>
This package contains a C++ parser for the Collada robot This package contains a C++ parser for the Collada robot
description format. The parser reads a Collada XML robot description format. The parser reads a Collada XML robot

View File

@ -26,7 +26,7 @@ if( ASSIMP_FOUND )
include_directories(${ASSIMP_INCLUDE_DIRS}) include_directories(${ASSIMP_INCLUDE_DIRS})
link_directories(${ASSIMP_LIBRARY_DIRS}) link_directories(${ASSIMP_LIBRARY_DIRS})
else() else()
message(STATUS "could not find assimp (perhaps available thorugh ROS package?), so assimping assimp v2") message(STATUS "could not find assimp (perhaps available thorugh ROS package?), so assuming assimp v2")
set(ASSIMP_LIBRARIES assimp) set(ASSIMP_LIBRARIES assimp)
set(ASSIMP_LIBRARY_DIRS) set(ASSIMP_LIBRARY_DIRS)
set(ASSIMP_CXX_FLAGS) set(ASSIMP_CXX_FLAGS)
@ -63,8 +63,8 @@ catkin_add_gtest(test_collada_writer test/test_collada_urdf.cpp)
target_link_libraries(test_collada_writer ${PROJECT_NAME}) target_link_libraries(test_collada_writer ${PROJECT_NAME})
install(TARGETS ${PROJECT_NAME} urdf_to_collada install(TARGETS ${PROJECT_NAME} urdf_to_collada
LIBRARY DESTINATION lib LIBRARY DESTINATION ${CATKIN_PACKAGE_LIB_DESTINATION}
RUNTIME DESTINATION bin) RUNTIME DESTINATION ${CATKIN_PACKAGE_BIN_DESTINATION})
install(DIRECTORY include/ install(DIRECTORY include/
DESTINATION include) DESTINATION ${CATKIN_PACKAGE_INCLUDE_DESTINATION})

View File

@ -1,6 +1,6 @@
<package> <package>
<name>collada_urdf</name> <name>collada_urdf</name>
<version>1.9.25</version> <version>1.9.26</version>
<description> <description>
This package contains a tool to convert Unified Robot Description Format (URDF) documents into COLLAborative Design Activity (COLLADA) documents. This package contains a tool to convert Unified Robot Description Format (URDF) documents into COLLAborative Design Activity (COLLADA) documents.

View File

@ -35,7 +35,7 @@ target_link_libraries(test_kdl_parser ${PROJECT_NAME})
# How does CATKIN do this? # How does CATKIN do this?
#rosbuild_add_rostest(${PROJECT_SOURCE_DIR}/test/test_kdl_parser.launch) #rosbuild_add_rostest(${PROJECT_SOURCE_DIR}/test/test_kdl_parser.launch)
install(TARGETS ${PROJECT_NAME} install(TARGETS ${PROJECT_NAME}
DESTINATION lib) DESTINATION ${CATKIN_PACKAGE_LIB_DESTINATION})
install(DIRECTORY include/ install(DIRECTORY include/
DESTINATION include) DESTINATION ${CATKIN_PACKAGE_INCLUDE_DESTINATION})

View File

@ -1,8 +1,8 @@
<package> <package>
<name>kdl_parser</name> <name>kdl_parser</name>
<version>1.9.25</version> <version>1.9.26</version>
<description brief="Package to parse urdf in to kdl tree"> <description>
The Kinematics and Dynamics Library (KDL) defines a tree structure The Kinematics and Dynamics Library (KDL) defines a tree structure
to represent the kinematic and dynamic parameters of a robot to represent the kinematic and dynamic parameters of a robot

View File

@ -27,7 +27,7 @@ target_link_libraries(${PROJECT_NAME} ${CURL_LIBRARIES} ${catkin_LIBRARIES})
add_subdirectory(test EXCLUDE_FROM_ALL) add_subdirectory(test EXCLUDE_FROM_ALL)
install(TARGETS ${PROJECT_NAME} install(TARGETS ${PROJECT_NAME}
DESTINATION lib) DESTINATION ${CATKIN_PACKAGE_LIB_DESTINATION})
install(DIRECTORY include/ install(DIRECTORY include/
DESTINATION include) DESTINATION ${CATKIN_PACKAGE_INCLUDE_DESTINATION})

View File

@ -1,6 +1,6 @@
<package> <package>
<name>resource_retriever</name> <name>resource_retriever</name>
<version>1.9.25</version> <version>1.9.26</version>
<description> <description>
This package retrieves data from url-format files such as http://, This package retrieves data from url-format files such as http://,

View File

@ -1,6 +1,6 @@
<package> <package>
<name>robot_model</name> <name>robot_model</name>
<version>1.9.25</version> <version>1.9.26</version>
<description> <description>
<tt>robot_model</tt> contains packages for modeling various <tt>robot_model</tt> contains packages for modeling various
aspects of robot information, specified in the Xml Robot aspects of robot information, specified in the Xml Robot
@ -9,15 +9,13 @@
object model (C++) of the robot. object model (C++) of the robot.
</description> </description>
<author email="isucan@willowgarage.com">Ioan Sucan</author> <author email="isucan@willowgarage.com">Maintained by Ioan Sucan</author>
<maintainer email="isucan@willowgarage.com">Ioan Sucan</maintainer> <maintainer email="isucan@willowgarage.com">Ioan Sucan</maintainer>
<license>BSD</license> <license>BSD</license>
<license>GPL</license> <license>GPL</license>
<license>MIT</license> <license>MIT</license>
<copyright>Willow Garage</copyright>
<url type="website">http://ros.org/wiki/robot_model</url> <url type="website">http://ros.org/wiki/robot_model</url>
<build_depend>catkin</build_depend> <build_depend>catkin</build_depend>

View File

@ -1,6 +1,6 @@
<package> <package>
<name>srdf</name> <name>srdf</name>
<version>1.9.25</version> <version>1.9.26</version>
<description> <description>

View File

@ -39,8 +39,8 @@ target_link_libraries(test_parser ${PROJECT_NAME})
# rosbuild_add_rostest(${PROJECT_SOURCE_DIR}/test/test_robot_model_parser.launch) # rosbuild_add_rostest(${PROJECT_SOURCE_DIR}/test/test_robot_model_parser.launch)
install(TARGETS ${PROJECT_NAME} check_urdf urdf_to_graphiz install(TARGETS ${PROJECT_NAME} check_urdf urdf_to_graphiz
LIBRARY DESTINATION lib LIBRARY DESTINATION ${CATKIN_PACKAGE_LIB_DESTINATION}
RUNTIME DESTINATION bin) RUNTIME DESTINATION ${CATKIN_PACKAGE_BIN_DESTINATION})
install(DIRECTORY include/ install(DIRECTORY include/
DESTINATION include) DESTINATION ${CATKIN_PACKAGE_INCLUDE_DESTINATION})

View File

@ -1,6 +1,6 @@
<package> <package>
<name>urdf</name> <name>urdf</name>
<version>1.9.25</version> <version>1.9.26</version>
<description> <description>
This package contains a C++ parser for the Unified Robot Description This package contains a C++ parser for the Unified Robot Description
Format (URDF), which is an XML format for representing a robot model. Format (URDF), which is an XML format for representing a robot model.

View File

@ -1,6 +1,6 @@
<package> <package>
<name>urdf_interface</name> <name>urdf_interface</name>
<version>1.9.25</version> <version>1.9.26</version>
<description> <description>
This package is DEPRECATED. Please use the urdfdom dependency directly instead of this package. This package is DEPRECATED. Please use the urdfdom dependency directly instead of this package.

View File

@ -1,6 +1,6 @@
<package> <package>
<name>urdf_parser</name> <name>urdf_parser</name>
<version>1.9.25</version> <version>1.9.26</version>
<description> <description>
This package is DEPRECATED. Please use the urdfdom dependency directly instead of this package. This package is DEPRECATED. Please use the urdfdom dependency directly instead of this package.