forked from ekumenlabs/roscpp_android
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request ekumenlabs#33 from Intermodalics/update-urdfdom
Update console_bridge, urdfdom_headers, urdfdom and collada_dom
- Loading branch information
Showing
5 changed files
with
81 additions
and
24 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,12 @@ | ||
| --- libs/console_bridge/CMakeLists.txt | ||
| +++ libs/console_bridge/CMakeLists.txt | ||
| @@ -89,5 +89,7 @@ SET_DIRECTORY_PROPERTIES(PROPERTIES | ||
| ADDITIONAL_MAKE_CLEAN_FILES ${CMAKE_BINARY_DIR}/console_bridge-config.cmake | ||
| ADDITIONAL_MAKE_CLEAN_FILES ${CMAKE_BINARY_DIR}/console_bridge.pc) | ||
|
|
||
| -enable_testing() | ||
| -add_subdirectory(test) | ||
| +if(NOT ANDROID) | ||
| + enable_testing() | ||
| + add_subdirectory(test) | ||
| +endif() |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,25 +1,66 @@ | ||
| --- libs/urdfdom/urdf_parser/CMakeLists.txt 2014-11-13 18:42:30.721044671 -0300 | ||
| +++ libs/urdfdom/urdf_parser/CMakeLists.txt 2014-11-13 18:38:03.475500828 -0300 | ||
| @@ -1,18 +1,18 @@ | ||
| --- libs/urdfdom/urdf_parser/CMakeLists.txt | ||
| +++ libs/urdfdom/urdf_parser/CMakeLists.txt | ||
| @@ -1,42 +1,46 @@ | ||
| include_directories(include) | ||
|
|
||
| -add_library(urdfdom_world SHARED src/pose.cpp src/model.cpp src/link.cpp src/joint.cpp src/world.cpp) | ||
| +add_library(urdfdom_world src/pose.cpp src/model.cpp src/link.cpp src/joint.cpp src/world.cpp) | ||
| target_link_libraries(urdfdom_world ${tinyxml_libraries} ${console_bridge_LIBRARIES} ${Boost_LIBRARIES}) | ||
| set_target_properties(urdfdom_world PROPERTIES SOVERSION 0.3) | ||
| target_link_libraries(urdfdom_world ${TinyXML_LIBRARIES} ${console_bridge_LIBRARIES} ${Boost_LIBRARIES}) | ||
| set_target_properties(urdfdom_world PROPERTIES SOVERSION ${URDF_MAJOR_MINOR_VERSION}) | ||
|
|
||
| -add_library(urdfdom_model SHARED src/pose.cpp src/model.cpp src/link.cpp src/joint.cpp) | ||
| +add_library(urdfdom_model src/pose.cpp src/model.cpp src/link.cpp src/joint.cpp) | ||
| target_link_libraries(urdfdom_model ${tinyxml_libraries} ${console_bridge_LIBRARIES} ${Boost_LIBRARIES}) | ||
| set_target_properties(urdfdom_model PROPERTIES SOVERSION 0.3) | ||
| target_link_libraries(urdfdom_model ${TinyXML_LIBRARIES} ${console_bridge_LIBRARIES} ${Boost_LIBRARIES}) | ||
| set_target_properties(urdfdom_model PROPERTIES SOVERSION ${URDF_MAJOR_MINOR_VERSION}) | ||
|
|
||
| -add_library(urdfdom_sensor SHARED src/urdf_sensor.cpp) | ||
| +add_library(urdfdom_sensor src/urdf_sensor.cpp) | ||
| target_link_libraries(urdfdom_sensor urdfdom_model ${tinyxml_libraries} ${console_bridge_LIBRARIES} ${Boost_LIBRARIES}) | ||
| set_target_properties(urdfdom_sensor PROPERTIES SOVERSION 0.3) | ||
| target_link_libraries(urdfdom_sensor urdfdom_model ${TinyXML_LIBRARIES} ${console_bridge_LIBRARIES} ${Boost_LIBRARIES}) | ||
| set_target_properties(urdfdom_sensor PROPERTIES SOVERSION ${URDF_MAJOR_MINOR_VERSION}) | ||
|
|
||
| -add_library(urdfdom_model_state SHARED src/urdf_model_state.cpp src/twist.cpp) | ||
| +add_library(urdfdom_model_state src/urdf_model_state.cpp src/twist.cpp) | ||
| target_link_libraries(urdfdom_model_state ${tinyxml_libraries} ${console_bridge_LIBRARIES} ${Boost_LIBRARIES}) | ||
| set_target_properties(urdfdom_model_state PROPERTIES SOVERSION 0.3) | ||
| target_link_libraries(urdfdom_model_state ${TinyXML_LIBRARIES} ${console_bridge_LIBRARIES} ${Boost_LIBRARIES}) | ||
| set_target_properties(urdfdom_model_state PROPERTIES SOVERSION ${URDF_MAJOR_MINOR_VERSION}) | ||
|
|
||
| # -------------------------------- | ||
|
|
||
| -add_executable(check_urdf src/check_urdf.cpp) | ||
| -target_link_libraries(check_urdf urdfdom_model urdfdom_world) | ||
| +if(NOT ANDROID) | ||
| + add_executable(check_urdf src/check_urdf.cpp) | ||
| + target_link_libraries(check_urdf urdfdom_model urdfdom_world) | ||
|
|
||
| -add_executable(urdf_to_graphiz src/urdf_to_graphiz.cpp) | ||
| -target_link_libraries(urdf_to_graphiz urdfdom_model) | ||
| + add_executable(urdf_to_graphiz src/urdf_to_graphiz.cpp) | ||
| + target_link_libraries(urdf_to_graphiz urdfdom_model) | ||
|
|
||
| -# urdf_mem_test is a binary for testing, not a unit test | ||
| -add_executable(urdf_mem_test test/memtest.cpp) | ||
| -target_link_libraries(urdf_mem_test urdfdom_model) | ||
| + # urdf_mem_test is a binary for testing, not a unit test | ||
| + add_executable(urdf_mem_test test/memtest.cpp) | ||
| + target_link_libraries(urdf_mem_test urdfdom_model) | ||
|
|
||
| -# unit test to fix geometry problems | ||
| -add_executable(urdf_unit_test test/urdf_unit_test.cpp) | ||
| -target_link_libraries(urdf_unit_test urdfdom_model ${Boost_LIBRARIES}) | ||
| -add_test(urdf_unit_test urdf_unit_test) | ||
| + # unit test to fix geometry problems | ||
| + add_executable(urdf_unit_test test/urdf_unit_test.cpp) | ||
| + target_link_libraries(urdf_unit_test urdfdom_model ${Boost_LIBRARIES}) | ||
| + add_test(urdf_unit_test urdf_unit_test) | ||
| +endif() | ||
|
|
||
| INSTALL(TARGETS urdfdom_model DESTINATION ${CMAKE_INSTALL_LIBDIR}) | ||
| INSTALL(TARGETS urdfdom_world DESTINATION ${CMAKE_INSTALL_LIBDIR}) | ||
| -INSTALL(TARGETS check_urdf urdf_to_graphiz urdf_mem_test | ||
| - DESTINATION ${CMAKE_INSTALL_BINDIR}) | ||
| +if(NOT ANDROID) | ||
| + INSTALL(TARGETS check_urdf urdf_to_graphiz urdf_mem_test | ||
| + DESTINATION ${CMAKE_INSTALL_BINDIR}) | ||
| +endif() | ||
| INSTALL(TARGETS urdfdom_sensor DESTINATION ${CMAKE_INSTALL_LIBDIR}) | ||
| INSTALL(TARGETS urdfdom_model_state DESTINATION ${CMAKE_INSTALL_LIBDIR}) | ||
| INSTALL(DIRECTORY include/urdf_parser DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}) |