Last active
December 22, 2015 19:39
-
-
Save vmayoral/6520685 to your computer and use it in GitHub Desktop.
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
| From 620cb72934eec1fa12eeb007f70d2cb8a0dd9ef9 Mon Sep 17 00:00:00 2001 | |
| From: =?UTF-8?q?V=C3=ADctor=20Mayoral=20Vilches?= <v.mayoralv@gmail.com> | |
| Date: Wed, 11 Sep 2013 10:05:33 +0200 | |
| Subject: [PATCH] CMakeLists fix to fit with OpenEmbedded/Yocto meta-ros layer. | |
| This fixes increase the compatibility of the ros_control code with | |
| meta-ros, an OpenEmbedded/Yocto layer that provides recipes for ROS | |
| packages. | |
| --- | |
| controller_manager_tests/CMakeLists.txt | 10 ++++++---- | |
| hardware_interface/CMakeLists.txt | 34 +++++++++++++++++---------------- | |
| joint_limits_interface/CMakeLists.txt | 16 +++++++++------- | |
| transmission_interface/CMakeLists.txt | 12 +++++++----- | |
| 4 files changed, 40 insertions(+), 32 deletions(-) | |
| diff --git a/controller_manager_tests/CMakeLists.txt b/controller_manager_tests/CMakeLists.txt | |
| index 1f553fa..95c73cc 100644 | |
| --- a/controller_manager_tests/CMakeLists.txt | |
| +++ b/controller_manager_tests/CMakeLists.txt | |
| @@ -52,10 +52,12 @@ else() | |
| add_executable(dummy_app src/dummy_app.cpp) | |
| target_link_libraries(dummy_app ${PROJECT_NAME} ${catkin_LIBRARIES}) | |
| - add_executable(cm_test test/cm_test.cpp) | |
| - add_dependencies(tests cm_test) | |
| - target_link_libraries(cm_test ${GTEST_LIBRARIES} ${catkin_LIBRARIES}) | |
| - add_rostest(test/cm_test.test) | |
| + if(CATKIN_ENABLE_TESTING) | |
| + add_executable(cm_test test/cm_test.cpp) | |
| + add_dependencies(tests cm_test) | |
| + target_link_libraries(cm_test ${GTEST_LIBRARIES} ${catkin_LIBRARIES}) | |
| + add_rostest(test/cm_test.test) | |
| + endif() | |
| # Install | |
| install(DIRECTORY include/${PROJECT_NAME}/ | |
| diff --git a/hardware_interface/CMakeLists.txt b/hardware_interface/CMakeLists.txt | |
| index 2681794..105421a 100644 | |
| --- a/hardware_interface/CMakeLists.txt | |
| +++ b/hardware_interface/CMakeLists.txt | |
| @@ -40,29 +40,31 @@ else() | |
| INCLUDE_DIRS include | |
| ) | |
| - catkin_add_gtest(hardware_resource_manager_test test/hardware_resource_manager_test.cpp) | |
| - target_link_libraries(hardware_resource_manager_test ${catkin_LIBRARIES}) | |
| + if(CATKIN_ENABLE_TESTING) | |
| + catkin_add_gtest(hardware_resource_manager_test test/hardware_resource_manager_test.cpp) | |
| + target_link_libraries(hardware_resource_manager_test ${catkin_LIBRARIES}) | |
| - catkin_add_gtest(actuator_state_interface_test test/actuator_state_interface_test.cpp) | |
| - target_link_libraries(actuator_state_interface_test ${catkin_LIBRARIES}) | |
| + catkin_add_gtest(actuator_state_interface_test test/actuator_state_interface_test.cpp) | |
| + target_link_libraries(actuator_state_interface_test ${catkin_LIBRARIES}) | |
| - catkin_add_gtest(actuator_command_interface_test test/actuator_command_interface_test.cpp) | |
| - target_link_libraries(actuator_command_interface_test ${catkin_LIBRARIES}) | |
| + catkin_add_gtest(actuator_command_interface_test test/actuator_command_interface_test.cpp) | |
| + target_link_libraries(actuator_command_interface_test ${catkin_LIBRARIES}) | |
| - catkin_add_gtest(joint_state_interface_test test/joint_state_interface_test.cpp) | |
| - target_link_libraries(joint_state_interface_test ${catkin_LIBRARIES}) | |
| + catkin_add_gtest(joint_state_interface_test test/joint_state_interface_test.cpp) | |
| + target_link_libraries(joint_state_interface_test ${catkin_LIBRARIES}) | |
| - catkin_add_gtest(joint_command_interface_test test/joint_command_interface_test.cpp) | |
| - target_link_libraries(joint_command_interface_test ${catkin_LIBRARIES}) | |
| + catkin_add_gtest(joint_command_interface_test test/joint_command_interface_test.cpp) | |
| + target_link_libraries(joint_command_interface_test ${catkin_LIBRARIES}) | |
| - catkin_add_gtest(force_torque_sensor_interface_test test/force_torque_sensor_interface_test.cpp) | |
| - target_link_libraries(force_torque_sensor_interface_test ${catkin_LIBRARIES}) | |
| + catkin_add_gtest(force_torque_sensor_interface_test test/force_torque_sensor_interface_test.cpp) | |
| + target_link_libraries(force_torque_sensor_interface_test ${catkin_LIBRARIES}) | |
| - catkin_add_gtest(imu_sensor_interface_test test/imu_sensor_interface_test.cpp) | |
| - target_link_libraries(imu_sensor_interface_test ${catkin_LIBRARIES}) | |
| + catkin_add_gtest(imu_sensor_interface_test test/imu_sensor_interface_test.cpp) | |
| + target_link_libraries(imu_sensor_interface_test ${catkin_LIBRARIES}) | |
| - catkin_add_gtest(robot_hw_test test/robot_hw_test.cpp) | |
| - target_link_libraries(robot_hw_test ${catkin_LIBRARIES}) | |
| + catkin_add_gtest(robot_hw_test test/robot_hw_test.cpp) | |
| + target_link_libraries(robot_hw_test ${catkin_LIBRARIES}) | |
| + endif() | |
| # Install | |
| install(DIRECTORY include/${PROJECT_NAME}/ | |
| diff --git a/joint_limits_interface/CMakeLists.txt b/joint_limits_interface/CMakeLists.txt | |
| index 6e18253..1561b22 100644 | |
| --- a/joint_limits_interface/CMakeLists.txt | |
| +++ b/joint_limits_interface/CMakeLists.txt | |
| @@ -43,16 +43,18 @@ else() | |
| ${urdfdom_LIBRARIES} | |
| ) | |
| - catkin_add_gtest(joint_limits_interface_test test/joint_limits_interface_test.cpp) | |
| - target_link_libraries(joint_limits_interface_test ${catkin_LIBRARIES}) | |
| + if(CATKIN_ENABLE_TESTING) | |
| + catkin_add_gtest(joint_limits_interface_test test/joint_limits_interface_test.cpp) | |
| + target_link_libraries(joint_limits_interface_test ${catkin_LIBRARIES}) | |
| - catkin_add_gtest(joint_limits_urdf_test test/joint_limits_urdf_test.cpp) | |
| - target_link_libraries(joint_limits_urdf_test ${catkin_LIBRARIES}) | |
| + catkin_add_gtest(joint_limits_urdf_test test/joint_limits_urdf_test.cpp) | |
| + target_link_libraries(joint_limits_urdf_test ${catkin_LIBRARIES}) | |
| - catkin_add_gtest(joint_limits_rosparam_test test/joint_limits_urdf_test.cpp) | |
| - target_link_libraries(joint_limits_rosparam_test ${catkin_LIBRARIES}) | |
| + catkin_add_gtest(joint_limits_rosparam_test test/joint_limits_urdf_test.cpp) | |
| + target_link_libraries(joint_limits_rosparam_test ${catkin_LIBRARIES}) | |
| - add_rostest(test/joint_limits_rosparam.test) | |
| + add_rostest(test/joint_limits_rosparam.test) | |
| + endif() | |
| # Install | |
| install(DIRECTORY include/${PROJECT_NAME}/ | |
| diff --git a/transmission_interface/CMakeLists.txt b/transmission_interface/CMakeLists.txt | |
| index 89b5178..e18fcd9 100644 | |
| --- a/transmission_interface/CMakeLists.txt | |
| +++ b/transmission_interface/CMakeLists.txt | |
| @@ -85,11 +85,13 @@ else() | |
| ## Testing ## | |
| ############# | |
| - catkin_add_gtest(simple_transmission_test test/simple_transmission_test.cpp) | |
| - catkin_add_gtest(differential_transmission_test test/differential_transmission_test.cpp) | |
| - catkin_add_gtest(four_bar_linkage_transmission_test test/four_bar_linkage_transmission_test.cpp) | |
| - catkin_add_gtest(transmission_interface_test test/transmission_interface_test.cpp) | |
| - target_link_libraries(transmission_interface_test ${catkin_LIBRARIES} ${TinyXML_LIBRARIES}) | |
| + if(CATKIN_ENABLE_TESTING) | |
| + catkin_add_gtest(simple_transmission_test test/simple_transmission_test.cpp) | |
| + catkin_add_gtest(differential_transmission_test test/differential_transmission_test.cpp) | |
| + catkin_add_gtest(four_bar_linkage_transmission_test test/four_bar_linkage_transmission_test.cpp) | |
| + catkin_add_gtest(transmission_interface_test test/transmission_interface_test.cpp) | |
| + target_link_libraries(transmission_interface_test ${catkin_LIBRARIES} ${TinyXML_LIBRARIES}) | |
| + endif() | |
| endif() | |
| -- | |
| 1.8.3.1 | |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment