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

follow ros_unit -> rosunit name change

This commit is contained in:
Tully Foote 2010-10-27 01:32:08 +00:00
parent 34c9457ec6
commit 50d50f6c1f
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
core/rosbuild/private.cmake
View File

@ -123,7 +123,7 @@ endmacro(_rosbuild_check_package_location)
# helper function to register check that results were generated (#580) # helper function to register check that results were generated (#580)
macro(_rosbuild_check_rostest_xml_result test_name test_file) macro(_rosbuild_check_rostest_xml_result test_name test_file)
add_custom_target(${test_name}_result add_custom_target(${test_name}_result
COMMAND ${ros_unit_path}/bin/rostest-check-results ${test_file} COMMAND ${rosunit_path}/bin/rostest-check-results ${test_file}
VERBATIM) VERBATIM)
# Redeclaration of target is to workaround bug in 2.4.6 # Redeclaration of target is to workaround bug in 2.4.6
if(CMAKE_MINOR_VERSION LESS 6) if(CMAKE_MINOR_VERSION LESS 6)
@ -185,7 +185,7 @@ endmacro(_rosbuild_add_gtest)
# arguments as cmake doesn't know the name of the output file # arguments as cmake doesn't know the name of the output file
macro(_rosbuild_check_rostest_result test_name test_pkg test_file) macro(_rosbuild_check_rostest_result test_name test_pkg test_file)
add_custom_target(${test_name}_result add_custom_target(${test_name}_result
COMMAND ${ros_unit_path}/bin/rostest-check-results --rostest ${test_pkg} ${test_file} COMMAND ${rosunit_path}/bin/rostest-check-results --rostest ${test_pkg} ${test_file}
WORKING_DIRECTORY ${PROJECT_SOURCE_DIR} WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}
VERBATIM) VERBATIM)
# Redeclaration of target is to workaround bug in 2.4.6 # Redeclaration of target is to workaround bug in 2.4.6
@ -289,7 +289,7 @@ macro(_rosbuild_add_roslaunch_check file)
# Create target for this test # Create target for this test
add_custom_target(roslaunch_check_${_testname} add_custom_target(roslaunch_check_${_testname}
COMMAND ${ros_unit_path}/bin/roslaunch-check.py ${file} ${ARGN} COMMAND ${rosunit_path}/bin/roslaunch-check.py ${file} ${ARGN}
DEPENDS ${file} DEPENDS ${file}
WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
VERBATIM) VERBATIM)