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

add_gtest becoems catkin_add_gtest + no longer install manifest.xml manually

This commit is contained in:
Ioan Sucan 2012-09-07 12:48:42 +03:00
parent 0c8b6bac05
commit f3cbc83ad0
10 changed files with 5 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
collada_parser/CMakeLists.txt
View File

@ -44,7 +44,3 @@ install(TARGETS ${PROJECT_NAME}
install(DIRECTORY include/ install(DIRECTORY include/
DESTINATION include) DESTINATION include)
# for compatibility with old build system
install(FILES manifest.xml
DESTINATION share/${PROJECT_NAME})

2
collada_urdf/CMakeLists.txt
View File

@ -61,7 +61,7 @@ set_target_properties(${PROJECT_NAME} PROPERTIES LINK_FLAGS "${ASSIMP_LINK_FLAGS
add_executable(urdf_to_collada src/urdf_to_collada.cpp) add_executable(urdf_to_collada src/urdf_to_collada.cpp)
target_link_libraries(urdf_to_collada ${PROJECT_NAME}) target_link_libraries(urdf_to_collada ${PROJECT_NAME})
add_gtest(test_collada_writer test/test_collada_urdf.cpp) 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

6
kdl_parser/CMakeLists.txt
View File

@ -29,7 +29,7 @@ target_link_libraries(${PROJECT_NAME} ${tinyxml_library} ${Orocos-KDL_LIBRARIES}
add_executable(check_kdl_parser src/check_kdl_parser.cpp ) add_executable(check_kdl_parser src/check_kdl_parser.cpp )
target_link_libraries(check_kdl_parser ${PROJECT_NAME}) target_link_libraries(check_kdl_parser ${PROJECT_NAME})
add_gtest(test_kdl_parser test/test_kdl_parser.cpp ) catkin_add_gtest(test_kdl_parser test/test_kdl_parser.cpp )
target_link_libraries(test_kdl_parser ${PROJECT_NAME}) target_link_libraries(test_kdl_parser ${PROJECT_NAME})
# How does CATKIN do this? # How does CATKIN do this?
@ -39,7 +39,3 @@ install(TARGETS ${PROJECT_NAME}
install(DIRECTORY include/ install(DIRECTORY include/
DESTINATION include) DESTINATION include)
# for compatibility with old build system
install(FILES manifest.xml
DESTINATION share/${PROJECT_NAME})

4
resource_retriever/CMakeLists.txt
View File

@ -28,7 +28,3 @@ install(TARGETS ${PROJECT_NAME}
install(DIRECTORY include/ install(DIRECTORY include/
DESTINATION include) DESTINATION include)
# for compatibility with old build system
install(FILES manifest.xml
DESTINATION share/${PROJECT_NAME})

2
resource_retriever/test/CMakeLists.txt
View File

@ -1,4 +1,4 @@
set(EXECUTABLE_OUTPUT_PATH ${PROJECT_SOURCE_DIR}) set(EXECUTABLE_OUTPUT_PATH ${PROJECT_SOURCE_DIR})
add_gtest(${PROJECT_NAME}_utest test.cpp) catkin_add_gtest(${PROJECT_NAME}_utest test.cpp)
target_link_libraries(${PROJECT_NAME}_utest ${PROJECT_NAME}) target_link_libraries(${PROJECT_NAME}_utest ${PROJECT_NAME})

4
srdf/CMakeLists.txt
View File

@ -1,6 +1,2 @@
# for compatibility with old build system
install(FILES manifest.xml
DESTINATION share/srdf)
install(DIRECTORY include/ install(DIRECTORY include/
DESTINATION include) DESTINATION include)

2
stack.xml
View File

@ -1,6 +1,6 @@
<stack> <stack>
<name>robot_model</name> <name>robot_model</name>
<version>1.9.5</version> <version>1.9.6</version>
<description brief="Modeling robot information"> <description brief="Modeling robot information">
<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

6
urdf/CMakeLists.txt
View File

@ -41,7 +41,7 @@ target_link_libraries(check_urdf ${PROJECT_NAME})
add_executable(urdf_to_graphiz src/urdf_to_graphiz.cpp) add_executable(urdf_to_graphiz src/urdf_to_graphiz.cpp)
target_link_libraries(urdf_to_graphiz ${PROJECT_NAME}) target_link_libraries(urdf_to_graphiz ${PROJECT_NAME})
add_gtest(test_parser EXCLUDE_FROM_ALL test/test_robot_model_parser.cpp) catkin_add_gtest(test_parser EXCLUDE_FROM_ALL test/test_robot_model_parser.cpp)
target_link_libraries(test_parser ${PROJECT_NAME}) target_link_libraries(test_parser ${PROJECT_NAME})
# no idea how CATKIN does this # no idea how CATKIN does this
@ -53,7 +53,3 @@ install(TARGETS ${PROJECT_NAME} check_urdf urdf_to_graphiz
install(DIRECTORY include/ install(DIRECTORY include/
DESTINATION include) DESTINATION include)
# for compatibility with old build system
install(FILES manifest.xml
DESTINATION share/${PROJECT_NAME})

4
urdf_interface/CMakeLists.txt
View File

@ -1,6 +1,2 @@
# for compatibility with old build system
install(FILES manifest.xml
DESTINATION share/urdf_interface)
install(DIRECTORY include/ install(DIRECTORY include/
DESTINATION include) DESTINATION include)

3
urdf_parser/CMakeLists.txt
View File

@ -1,3 +0,0 @@
# for compatibility with old build system
install(FILES manifest.xml
DESTINATION share/urdf_parser)