From d9466df01d721a6cb611affa820483ac5b8b9ead Mon Sep 17 00:00:00 2001 From: Ioan Sucan Date: Mon, 5 Nov 2012 21:44:14 +0200 Subject: [PATCH] fix install target locations --- Makefile | 1 - collada_parser/CMakeLists.txt | 4 ++-- collada_parser/package.xml | 2 +- collada_urdf/CMakeLists.txt | 10 +++++----- collada_urdf/package.xml | 2 +- kdl_parser/CMakeLists.txt | 4 ++-- kdl_parser/package.xml | 4 ++-- resource_retriever/CMakeLists.txt | 4 ++-- resource_retriever/package.xml | 2 +- robot_model/package.xml | 6 ++---- srdf/package.xml | 2 +- urdf/CMakeLists.txt | 6 +++--- urdf/package.xml | 2 +- urdf_interface/package.xml | 2 +- urdf_parser/package.xml | 2 +- 15 files changed, 25 insertions(+), 28 deletions(-) delete mode 100644 Makefile diff --git a/Makefile b/Makefile deleted file mode 100644 index a818cca..0000000 --- a/Makefile +++ /dev/null @@ -1 +0,0 @@ -include $(shell rospack find mk)/cmake_stack.mk \ No newline at end of file diff --git a/collada_parser/CMakeLists.txt b/collada_parser/CMakeLists.txt index 7d07ef8..a8da47d 100644 --- a/collada_parser/CMakeLists.txt +++ b/collada_parser/CMakeLists.txt @@ -45,7 +45,7 @@ else() endif() install(TARGETS ${PROJECT_NAME} - DESTINATION lib) + DESTINATION ${CATKIN_PACKAGE_LIB_DESTINATION}) install(DIRECTORY include/ - DESTINATION include) + DESTINATION ${CATKIN_PACKAGE_INCLUDE_DESTINATION}) diff --git a/collada_parser/package.xml b/collada_parser/package.xml index 820d6aa..492220e 100644 --- a/collada_parser/package.xml +++ b/collada_parser/package.xml @@ -1,6 +1,6 @@ collada_parser - 1.9.25 + 1.9.26 This package contains a C++ parser for the Collada robot description format. The parser reads a Collada XML robot diff --git a/collada_urdf/CMakeLists.txt b/collada_urdf/CMakeLists.txt index d42c34b..66f71b4 100644 --- a/collada_urdf/CMakeLists.txt +++ b/collada_urdf/CMakeLists.txt @@ -14,7 +14,7 @@ find_package(Boost REQUIRED COMPONENTS system) include_directories(${Boost_INCLUDE_DIR}) find_package(assimp QUIET) -if( NOT assimp_FOUND ) +if ( NOT assimp_FOUND ) find_package(PkgConfig REQUIRED) pkg_check_modules(ASSIMP assimp) endif() @@ -26,7 +26,7 @@ if( ASSIMP_FOUND ) include_directories(${ASSIMP_INCLUDE_DIRS}) link_directories(${ASSIMP_LIBRARY_DIRS}) 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_LIBRARY_DIRS) 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}) install(TARGETS ${PROJECT_NAME} urdf_to_collada - LIBRARY DESTINATION lib - RUNTIME DESTINATION bin) + LIBRARY DESTINATION ${CATKIN_PACKAGE_LIB_DESTINATION} + RUNTIME DESTINATION ${CATKIN_PACKAGE_BIN_DESTINATION}) install(DIRECTORY include/ - DESTINATION include) + DESTINATION ${CATKIN_PACKAGE_INCLUDE_DESTINATION}) diff --git a/collada_urdf/package.xml b/collada_urdf/package.xml index e0a8b64..70f1d89 100644 --- a/collada_urdf/package.xml +++ b/collada_urdf/package.xml @@ -1,6 +1,6 @@ collada_urdf - 1.9.25 + 1.9.26 This package contains a tool to convert Unified Robot Description Format (URDF) documents into COLLAborative Design Activity (COLLADA) documents. diff --git a/kdl_parser/CMakeLists.txt b/kdl_parser/CMakeLists.txt index 2764885..33774c2 100644 --- a/kdl_parser/CMakeLists.txt +++ b/kdl_parser/CMakeLists.txt @@ -35,7 +35,7 @@ target_link_libraries(test_kdl_parser ${PROJECT_NAME}) # How does CATKIN do this? #rosbuild_add_rostest(${PROJECT_SOURCE_DIR}/test/test_kdl_parser.launch) install(TARGETS ${PROJECT_NAME} - DESTINATION lib) + DESTINATION ${CATKIN_PACKAGE_LIB_DESTINATION}) install(DIRECTORY include/ - DESTINATION include) + DESTINATION ${CATKIN_PACKAGE_INCLUDE_DESTINATION}) diff --git a/kdl_parser/package.xml b/kdl_parser/package.xml index d772043..79ba500 100644 --- a/kdl_parser/package.xml +++ b/kdl_parser/package.xml @@ -1,8 +1,8 @@ kdl_parser - 1.9.25 + 1.9.26 - + The Kinematics and Dynamics Library (KDL) defines a tree structure to represent the kinematic and dynamic parameters of a robot diff --git a/resource_retriever/CMakeLists.txt b/resource_retriever/CMakeLists.txt index 30f80a4..0c6a4eb 100644 --- a/resource_retriever/CMakeLists.txt +++ b/resource_retriever/CMakeLists.txt @@ -27,7 +27,7 @@ target_link_libraries(${PROJECT_NAME} ${CURL_LIBRARIES} ${catkin_LIBRARIES}) add_subdirectory(test EXCLUDE_FROM_ALL) install(TARGETS ${PROJECT_NAME} - DESTINATION lib) + DESTINATION ${CATKIN_PACKAGE_LIB_DESTINATION}) install(DIRECTORY include/ - DESTINATION include) + DESTINATION ${CATKIN_PACKAGE_INCLUDE_DESTINATION}) diff --git a/resource_retriever/package.xml b/resource_retriever/package.xml index b212939..b77ef2b 100644 --- a/resource_retriever/package.xml +++ b/resource_retriever/package.xml @@ -1,6 +1,6 @@ resource_retriever - 1.9.25 + 1.9.26 This package retrieves data from url-format files such as http://, diff --git a/robot_model/package.xml b/robot_model/package.xml index 7f8524e..6667ef8 100644 --- a/robot_model/package.xml +++ b/robot_model/package.xml @@ -1,6 +1,6 @@ robot_model - 1.9.25 + 1.9.26 robot_model contains packages for modeling various aspects of robot information, specified in the Xml Robot @@ -9,15 +9,13 @@ object model (C++) of the robot. - Ioan Sucan + Maintained by Ioan Sucan Ioan Sucan BSD GPL MIT - Willow Garage - http://ros.org/wiki/robot_model catkin diff --git a/srdf/package.xml b/srdf/package.xml index f124f9d..ab67ca0 100644 --- a/srdf/package.xml +++ b/srdf/package.xml @@ -1,6 +1,6 @@ srdf - 1.9.25 + 1.9.26 diff --git a/urdf/CMakeLists.txt b/urdf/CMakeLists.txt index b355c27..9b0ae60 100644 --- a/urdf/CMakeLists.txt +++ b/urdf/CMakeLists.txt @@ -39,8 +39,8 @@ target_link_libraries(test_parser ${PROJECT_NAME}) # rosbuild_add_rostest(${PROJECT_SOURCE_DIR}/test/test_robot_model_parser.launch) install(TARGETS ${PROJECT_NAME} check_urdf urdf_to_graphiz - LIBRARY DESTINATION lib - RUNTIME DESTINATION bin) + LIBRARY DESTINATION ${CATKIN_PACKAGE_LIB_DESTINATION} + RUNTIME DESTINATION ${CATKIN_PACKAGE_BIN_DESTINATION}) install(DIRECTORY include/ - DESTINATION include) + DESTINATION ${CATKIN_PACKAGE_INCLUDE_DESTINATION}) diff --git a/urdf/package.xml b/urdf/package.xml index bd3c898..6f0e6cb 100644 --- a/urdf/package.xml +++ b/urdf/package.xml @@ -1,6 +1,6 @@ urdf - 1.9.25 + 1.9.26 This package contains a C++ parser for the Unified Robot Description Format (URDF), which is an XML format for representing a robot model. diff --git a/urdf_interface/package.xml b/urdf_interface/package.xml index 57e9c7b..108e875 100644 --- a/urdf_interface/package.xml +++ b/urdf_interface/package.xml @@ -1,6 +1,6 @@ urdf_interface - 1.9.25 + 1.9.26 This package is DEPRECATED. Please use the urdfdom dependency directly instead of this package. diff --git a/urdf_parser/package.xml b/urdf_parser/package.xml index c34ce99..c18d159 100644 --- a/urdf_parser/package.xml +++ b/urdf_parser/package.xml @@ -1,6 +1,6 @@ urdf_parser - 1.9.25 + 1.9.26 This package is DEPRECATED. Please use the urdfdom dependency directly instead of this package.