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

deprecated graphical macros

This commit is contained in:
Brian Gerkey 2009-09-22 18:20:06 +00:00
parent 29ade0d0c4
commit 041b835eaa
2 changed files with 10 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
core/rosbuild/deprecated.cmake
View File

@ -76,6 +76,11 @@ macro(rospack_add_rostest_graphical)
rosbuild_add_rostest_graphical(${ARGV})
endmacro(rospack_add_rostest_graphical)
macro(rosbuild_add_rostest_graphical)
_rosbuild_warn("rosbuild_add_rostest_graphical() is deprecated; use rosbuild_add_rostest() instead")
rosbuild_add_rostest(${ARGV})
endmacro(rosbuild_add_rostest_graphical)
macro(rospack_add_pyunit)
#_rosbuild_warn_deprecate_rospack_prefix(rospack_add_pyunit)
rosbuild_add_pyunit(${ARGV})
@ -91,6 +96,11 @@ macro(rospack_add_pyunit_graphical)
rosbuild_add_pyunit_graphical(${ARGV})
endmacro(rospack_add_pyunit_graphical)
macro(rosbuild_add_pyunit_graphical)
_rosbuild_warn("rosbuild_add_pyunit_graphical() is deprecated; use rosbuild_add_pyunit() instead")
rosbuild_add_pyunit(${ARGV})
endmacro(rosbuild_add_pyunit_graphical)
macro(get_msgs)
#_rosbuild_warn_deprecate_no_prefix(get_msgs)
rosbuild_get_msgs(${ARGV})

23
core/rosbuild/public.cmake
View File

@ -557,18 +557,6 @@ macro(rosbuild_add_rostest_future file)
add_dependencies(test-future rostest_${_testname})
endmacro(rosbuild_add_rostest_future)
# A helper to run rostests that require a graphical display.
# It generates a command to run rostest on
# the specified file and makes this target a dependency of test.
macro(rosbuild_add_rostest_graphical file)
string(REPLACE "/" "_" _testname ${file})
_rosbuild_add_rostest(${file} $ENV{ROS_BUILD_XVFB})
# Redeclaration of target is to workaround bug in 2.4.6
add_custom_target(test)
add_dependencies(test rostest_${_testname})
_rosbuild_check_rostest_result(rostest_${_testname} ${PROJECT_NAME} ${file})
endmacro(rosbuild_add_rostest_graphical)
# A helper to run Python unit tests. It generates a command to run python
# the specified file
macro(rosbuild_add_pyunit file)
@ -594,17 +582,6 @@ macro(rosbuild_add_pyunit_future file)
add_dependencies(test-future pyunit_${_testname})
endmacro(rosbuild_add_pyunit_future)
# A helper to run pyunit tests that require a graphical display.
# It generates a command to run python on
# the specified file and makes this target a dependency of test.
macro(rosbuild_add_pyunit_graphical file)
string(REPLACE "/" "_" _testname ${file})
_rosbuild_add_pyunit(${file} $ENV{ROS_BUILD_XVFB})
# Redeclaration of target is to workaround bug in 2.4.6
add_custom_target(test)
add_dependencies(test pyunit_${_testname})
endmacro(rosbuild_add_pyunit_graphical)
set(_ROSBUILD_GENERATED_MSG_FILES "")
macro(rosbuild_add_generated_msgs)
list(APPEND _ROSBUILD_GENERATED_MSG_FILES ${ARGV})