p36850791
/
kinetic-devel
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

turn roslib tests back on

This commit is contained in:
Brian Gerkey 2012-01-19 03:28:03 +00:00
parent b57fbadc64
commit 1de10dd8aa
2 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@ -14,9 +14,9 @@ catkin_export_python()
foreach(subdir
env-hooks
tools/rosunit
core/roslib
tools/rosbash
tools/rosunit
)
add_subdirectory(${subdir})
endforeach()

13
core/roslib/CMakeLists.txt
View File

@ -1,5 +1,5 @@
project(roslib)
find_package(ROS COMPONENTS catkin rospack)# rosunit)
find_package(ROS COMPONENTS catkin rospack rosunit)
include_directories(include ${Boost_INCLUDE_DIRS} ${ROS_INCLUDE_DIRS})
@ -36,9 +36,8 @@ catkin_project(roslib
#integration tests
message("TODO: move roslib's gtests somewhere else, because roslib can't depend on rosunit")
#add_gtest(${PROJECT_NAME}-utest test/utest.cpp)
#target_link_libraries(${PROJECT_NAME}-utest roslib ${Boost_LIBRARIES} ${ROS_LIBRARIES})
#
#add_gtest(${PROJECT_NAME}-test_package test/package.cpp)
#target_link_libraries(${PROJECT_NAME}-test_package roslib ${ROS_LIBRARIES})
add_gtest(${PROJECT_NAME}-utest test/utest.cpp)
target_link_libraries(${PROJECT_NAME}-utest roslib ${Boost_LIBRARIES} ${ROS_LIBRARIES})
add_gtest(${PROJECT_NAME}-test_package test/package.cpp)
target_link_libraries(${PROJECT_NAME}-test_package roslib ${ROS_LIBRARIES})