From ec842e467089ae913fd5ae2dac9c5edeb7a9c9df Mon Sep 17 00:00:00 2001 From: Ioan Sucan Date: Tue, 6 Nov 2012 13:30:09 +0200 Subject: [PATCH] fix install locations for some include paths --- collada_parser/CMakeLists.txt | 2 +- collada_parser/package.xml | 2 +- collada_urdf/CMakeLists.txt | 2 +- collada_urdf/package.xml | 2 +- kdl_parser/CMakeLists.txt | 2 +- kdl_parser/package.xml | 2 +- resource_retriever/CMakeLists.txt | 2 +- resource_retriever/package.xml | 2 +- robot_model/package.xml | 2 +- srdf/package.xml | 2 +- urdf/CMakeLists.txt | 2 +- urdf/package.xml | 2 +- urdf_interface/package.xml | 2 +- urdf_parser/package.xml | 2 +- 14 files changed, 14 insertions(+), 14 deletions(-) diff --git a/collada_parser/CMakeLists.txt b/collada_parser/CMakeLists.txt index a8da47d..716ac36 100644 --- a/collada_parser/CMakeLists.txt +++ b/collada_parser/CMakeLists.txt @@ -47,5 +47,5 @@ endif() install(TARGETS ${PROJECT_NAME} DESTINATION ${CATKIN_PACKAGE_LIB_DESTINATION}) -install(DIRECTORY include/ +install(DIRECTORY include/${PROJECT_NAME}/ DESTINATION ${CATKIN_PACKAGE_INCLUDE_DESTINATION}) diff --git a/collada_parser/package.xml b/collada_parser/package.xml index 492220e..fe5e656 100644 --- a/collada_parser/package.xml +++ b/collada_parser/package.xml @@ -1,6 +1,6 @@ collada_parser - 1.9.26 + 1.9.27 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 66f71b4..24aa3c3 100644 --- a/collada_urdf/CMakeLists.txt +++ b/collada_urdf/CMakeLists.txt @@ -66,5 +66,5 @@ install(TARGETS ${PROJECT_NAME} urdf_to_collada LIBRARY DESTINATION ${CATKIN_PACKAGE_LIB_DESTINATION} RUNTIME DESTINATION ${CATKIN_PACKAGE_BIN_DESTINATION}) -install(DIRECTORY include/ +install(DIRECTORY include/${PROJECT_NAME}/ DESTINATION ${CATKIN_PACKAGE_INCLUDE_DESTINATION}) diff --git a/collada_urdf/package.xml b/collada_urdf/package.xml index 70f1d89..9af5661 100644 --- a/collada_urdf/package.xml +++ b/collada_urdf/package.xml @@ -1,6 +1,6 @@ collada_urdf - 1.9.26 + 1.9.27 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 33774c2..f31c99d 100644 --- a/kdl_parser/CMakeLists.txt +++ b/kdl_parser/CMakeLists.txt @@ -37,5 +37,5 @@ target_link_libraries(test_kdl_parser ${PROJECT_NAME}) install(TARGETS ${PROJECT_NAME} DESTINATION ${CATKIN_PACKAGE_LIB_DESTINATION}) -install(DIRECTORY include/ +install(DIRECTORY include/${PROJECT_NAME}/ DESTINATION ${CATKIN_PACKAGE_INCLUDE_DESTINATION}) diff --git a/kdl_parser/package.xml b/kdl_parser/package.xml index 79ba500..dd53016 100644 --- a/kdl_parser/package.xml +++ b/kdl_parser/package.xml @@ -1,6 +1,6 @@ kdl_parser - 1.9.26 + 1.9.27 diff --git a/resource_retriever/CMakeLists.txt b/resource_retriever/CMakeLists.txt index 0c6a4eb..5b54fd9 100644 --- a/resource_retriever/CMakeLists.txt +++ b/resource_retriever/CMakeLists.txt @@ -29,5 +29,5 @@ add_subdirectory(test EXCLUDE_FROM_ALL) install(TARGETS ${PROJECT_NAME} DESTINATION ${CATKIN_PACKAGE_LIB_DESTINATION}) -install(DIRECTORY include/ +install(DIRECTORY include/${PROJECT_NAME}/ DESTINATION ${CATKIN_PACKAGE_INCLUDE_DESTINATION}) diff --git a/resource_retriever/package.xml b/resource_retriever/package.xml index b77ef2b..61ae63f 100644 --- a/resource_retriever/package.xml +++ b/resource_retriever/package.xml @@ -1,6 +1,6 @@ resource_retriever - 1.9.26 + 1.9.27 This package retrieves data from url-format files such as http://, diff --git a/robot_model/package.xml b/robot_model/package.xml index 6667ef8..5a261a9 100644 --- a/robot_model/package.xml +++ b/robot_model/package.xml @@ -1,6 +1,6 @@ robot_model - 1.9.26 + 1.9.27 robot_model contains packages for modeling various aspects of robot information, specified in the Xml Robot diff --git a/srdf/package.xml b/srdf/package.xml index ab67ca0..78eeee2 100644 --- a/srdf/package.xml +++ b/srdf/package.xml @@ -1,6 +1,6 @@ srdf - 1.9.26 + 1.9.27 diff --git a/urdf/CMakeLists.txt b/urdf/CMakeLists.txt index 9b0ae60..84e87a4 100644 --- a/urdf/CMakeLists.txt +++ b/urdf/CMakeLists.txt @@ -42,5 +42,5 @@ install(TARGETS ${PROJECT_NAME} check_urdf urdf_to_graphiz LIBRARY DESTINATION ${CATKIN_PACKAGE_LIB_DESTINATION} RUNTIME DESTINATION ${CATKIN_PACKAGE_BIN_DESTINATION}) -install(DIRECTORY include/ +install(DIRECTORY include//${PROJECT_NAME}/ DESTINATION ${CATKIN_PACKAGE_INCLUDE_DESTINATION}) diff --git a/urdf/package.xml b/urdf/package.xml index 6f0e6cb..e27c0b7 100644 --- a/urdf/package.xml +++ b/urdf/package.xml @@ -1,6 +1,6 @@ urdf - 1.9.26 + 1.9.27 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 108e875..e75b528 100644 --- a/urdf_interface/package.xml +++ b/urdf_interface/package.xml @@ -1,6 +1,6 @@ urdf_interface - 1.9.26 + 1.9.27 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 c18d159..3030aa6 100644 --- a/urdf_parser/package.xml +++ b/urdf_parser/package.xml @@ -1,6 +1,6 @@ urdf_parser - 1.9.26 + 1.9.27 This package is DEPRECATED. Please use the urdfdom dependency directly instead of this package.