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

check for CATKIN_ENABLE_TESTING

This commit is contained in:
Dirk Thomas 2013-07-03 11:20:29 -07:00
parent 544c24eb4b
commit 5701d7e840
10 changed files with 27 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
core/roslib/CMakeLists.txt
View File

@ -44,17 +44,18 @@ install(DIRECTORY include/
install(PROGRAMS scripts/gendeps
DESTINATION ${CATKIN_PACKAGE_BIN_DESTINATION})
if(CATKIN_ENABLE_TESTING)
catkin_add_nosetests(test)
catkin_add_nosetests(test)
catkin_add_gtest(${PROJECT_NAME}-utest test/utest.cpp WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR})
if(TARGET ${PROJECT_NAME}-utest)
target_link_libraries(${PROJECT_NAME}-utest roslib ${Boost_LIBRARIES} ${catkin_LIBRARIES})
endif()
catkin_add_gtest(${PROJECT_NAME}-utest test/utest.cpp WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR})
if(TARGET ${PROJECT_NAME}-utest)
target_link_libraries(${PROJECT_NAME}-utest roslib ${Boost_LIBRARIES} ${catkin_LIBRARIES})
endif()
catkin_add_gtest(${PROJECT_NAME}-test_package test/package.cpp)
if(TARGET ${PROJECT_NAME}-test_package)
target_link_libraries(${PROJECT_NAME}-test_package roslib ${catkin_LIBRARIES})
catkin_add_gtest(${PROJECT_NAME}-test_package test/package.cpp)
if(TARGET ${PROJECT_NAME}-test_package)
target_link_libraries(${PROJECT_NAME}-test_package roslib ${catkin_LIBRARIES})
endif()
endif()
file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/export.cmake "")

2
core/roslib/package.xml
View File

@ -13,7 +13,7 @@
<author email="mquigley@cs.stanford.edu">Morgan Quigley</author>
<author email="jfaust@willowgarage.com">Josh Faust</author>
<buildtool_depend>catkin</buildtool_depend>
<buildtool_depend version_gte="0.5.68">catkin</buildtool_depend>
<build_depend>boost</build_depend>
<build_depend>rospack</build_depend>

4
tools/rosclean/CMakeLists.txt
View File

@ -5,4 +5,6 @@ catkin_package()
catkin_python_setup()
catkin_add_nosetests(test)
if(CATKIN_ENABLE_TESTING)
catkin_add_nosetests(test)
endif()

2
tools/rosclean/package.xml
View File

@ -10,7 +10,7 @@
<url>http://ros.org/wiki/rosclean</url>
<author>Ken Conley</author>
<buildtool_depend>catkin</buildtool_depend>
<buildtool_depend version_gte="0.5.68">catkin</buildtool_depend>
<run_depend>python-rospkg</run_depend>
</package>

4
tools/roscreate/CMakeLists.txt
View File

@ -9,4 +9,6 @@ install(DIRECTORY templates/
DESTINATION ${CATKIN_PACKAGE_SHARE_DESTINATION}/templates
PATTERN ".svn" EXCLUDE)
catkin_add_nosetests(test)
if(CATKIN_ENABLE_TESTING)
catkin_add_nosetests(test)
endif()

2
tools/roscreate/package.xml
View File

@ -13,7 +13,7 @@
<author email="kwc@willowgarage.com">Ken Conley</author>
<buildtool_depend>catkin</buildtool_depend>
<buildtool_depend version_gte="0.5.68">catkin</buildtool_depend>
<run_depend>python-rospkg</run_depend>
</package>

4
tools/rosmake/CMakeLists.txt
View File

@ -6,4 +6,6 @@ catkin_package()
catkin_python_setup()
catkin_add_nosetests(test)
if(CATKIN_ENABLE_TESTING)
catkin_add_nosetests(test)
endif()

2
tools/rosmake/package.xml
View File

@ -11,7 +11,7 @@
<url>http://ros.org/wiki/rosmake</url>
<author email="tfoote@osrfoundation.org">Tully Foote</author>
<buildtool_depend>catkin</buildtool_depend>
<buildtool_depend version_gte="0.5.68">catkin</buildtool_depend>
<run_depend>catkin</run_depend>
<run_depend>python-rospkg</run_depend>

4
tools/rosunit/CMakeLists.txt
View File

@ -13,4 +13,6 @@ install(PROGRAMS
scripts/test_results_dir.py
DESTINATION ${CATKIN_PACKAGE_SHARE_DESTINATION}/scripts)
catkin_add_nosetests(test)
if(CATKIN_ENABLE_TESTING)
catkin_add_nosetests(test)
endif()

2
tools/rosunit/package.xml
View File

@ -12,7 +12,7 @@
<url type="repository">https://code.ros.org/svn/ros/stacks/ros/trunk/tools/rosunit</url>
<author>Ken Conley</author>
<buildtool_depend>catkin</buildtool_depend>
<buildtool_depend version_gte="0.5.68">catkin</buildtool_depend>
<run_depend>python-rospkg</run_depend>
<run_depend>roslib</run_depend>