Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

make rostest in CMakeLists optional (ros/rosdistro#3010) #75

Merged
merged 2 commits into from
Oct 27, 2017
Merged

make rostest in CMakeLists optional (ros/rosdistro#3010) #75

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e958839
make rostest in CMakeLists optional (ros/rosdistro#3010)
bulwahn Apr 4, 2017
d5879fd
rostest is now a test_depend instead of a build_depend
sloretz Oct 26, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ project(robot_state_publisher)

find_package(orocos_kdl REQUIRED)
find_package(catkin REQUIRED
COMPONENTS roscpp rosconsole rostime tf tf2_ros tf2_kdl kdl_parser rostest
COMPONENTS roscpp rosconsole rostime tf tf2_ros tf2_kdl kdl_parser
)
find_package(Eigen3 REQUIRED)

Expand Down Expand Up @@ -38,6 +38,8 @@ target_link_libraries(state_publisher ${PROJECT_NAME}_solver ${orocos_kdl_LIBRAR

if (CATKIN_ENABLE_TESTING)

find_package(rostest REQUIRED)

add_rostest_gtest(test_one_link ${CMAKE_CURRENT_SOURCE_DIR}/test/test_one_link.launch test/test_one_link.cpp)
target_link_libraries(test_one_link ${catkin_LIBRARIES} ${PROJECT_NAME}_solver)

Expand Down
3 changes: 1 addition & 2 deletions package.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,6 @@
<build_depend version_gte="1.3.0">orocos_kdl</build_depend>
<build_depend>rosconsole</build_depend>
<build_depend>roscpp</build_depend>
<build_depend>rostest</build_depend>
<build_depend>rostime</build_depend>
<build_depend>sensor_msgs</build_depend>
<build_depend>tf</build_depend>
Expand All @@ -49,5 +48,5 @@
<run_depend>tf2_ros</run_depend>
<run_depend>tf2_kdl</run_depend>

<build_depend>rostest</build_depend>
<test_depend>rostest</test_depend>
</package>