diff --git a/core/rosbuild/private.cmake b/core/rosbuild/private.cmake index 23a2c723..14e6e2e0 100644 --- a/core/rosbuild/private.cmake +++ b/core/rosbuild/private.cmake @@ -123,7 +123,7 @@ endmacro(_rosbuild_check_package_location) # helper function to register check that results were generated (#580) macro(_rosbuild_check_rostest_xml_result test_name test_file) 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) # Redeclaration of target is to workaround bug in 2.4.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 macro(_rosbuild_check_rostest_result test_name test_pkg test_file) 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} VERBATIM) # 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 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} WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} VERBATIM)