[Personalrobots-commit] SF.net SVN: personalrobots:[13029] pkg/trunk

[<ge...@us...>]

Revision: 13029
          http://personalrobots.svn.sourceforge.net/personalrobots/?rev=13029&view=rev
Author:   gerkey
Date:     2009-03-27 02:20:59 +0000 (Fri, 27 Mar 2009)

Log Message:
-----------
Moved to new rosbuild macro

Modified Paths:
--------------
    pkg/trunk/drivers/robot/pr2/point_cloud_assembler/CMakeLists.txt
    pkg/trunk/estimation/robot_pose_ekf/CMakeLists.txt

Modified: pkg/trunk/drivers/robot/pr2/point_cloud_assembler/CMakeLists.txt
===================================================================
--- pkg/trunk/drivers/robot/pr2/point_cloud_assembler/CMakeLists.txt	2009-03-27 02:18:33 UTC (rev 13028)
+++ pkg/trunk/drivers/robot/pr2/point_cloud_assembler/CMakeLists.txt	2009-03-27 02:20:59 UTC (rev 13029)
@@ -21,17 +21,4 @@
 set(EXECUTABLE_OUTPUT_PATH ${PROJECT_SOURCE_DIR}/bin)
 
 # Download needed data file
-# This code is wrapped up in a new macro, which hasn't yet been merged to
-# the stable branch of ROS.
-#rospack_download_test_data(http://pr.willowgarage.com/data/calonder_descriptor/current.rtc current.rtc)
-set(_url http://pr.willowgarage.com/data/point_cloud_assembler/test_assembler.bag)
-set(_filename test/test_assembler.bag)
-find_package(Wget REQUIRED)
-add_custom_command(OUTPUT ${PROJECT_SOURCE_DIR}/${_filename}
-                   COMMAND ${WGET_EXECUTABLE} -r ${_url} -O ${PROJECT_SOURCE_DIR}/${_filename}
-                   VERBATIM)
-# Create a legal target name, in case the target name has slashes in it
-string(REPLACE "/" "_" _testname download_data_${_filename})
-add_custom_target(${_testname}
-                  DEPENDS ${PROJECT_SOURCE_DIR}/${_filename})
-add_dependencies(tests ${_testname})
+rospack_download_test_data(http://pr.willowgarage.com/data/point_cloud_assembler/test_assembler.bag test/test_assembler.bag)

Modified: pkg/trunk/estimation/robot_pose_ekf/CMakeLists.txt
===================================================================
--- pkg/trunk/estimation/robot_pose_ekf/CMakeLists.txt	2009-03-27 02:18:33 UTC (rev 13028)
+++ pkg/trunk/estimation/robot_pose_ekf/CMakeLists.txt	2009-03-27 02:20:59 UTC (rev 13029)
@@ -20,17 +20,4 @@
 rospack_add_rostest(${CMAKE_CURRENT_SOURCE_DIR}/test/test_robot_pose_ekf.launch)
 
 # Download needed data file
-# This code is wrapped up in a new macro, which hasn't yet been merged to
-# the stable branch of ROS.
-#rospack_download_test_data(http://pr.willowgarage.com/data/calonder_descriptor/current.rtc current.rtc)
-set(_url http://pr.willowgarage.com/data/robot_pose_ekf/ekf_test.bag)
-set(_filename test/ekf_test.bag)
-find_package(Wget REQUIRED)
-add_custom_command(OUTPUT ${PROJECT_SOURCE_DIR}/${_filename}
-                   COMMAND ${WGET_EXECUTABLE} -r ${_url} -O ${PROJECT_SOURCE_DIR}/${_filename}
-                   VERBATIM)
-# Create a legal target name, in case the target name has slashes in it
-string(REPLACE "/" "_" _testname download_data_${_filename})
-add_custom_target(${_testname}
-                  DEPENDS ${PROJECT_SOURCE_DIR}/${_filename})
-add_dependencies(tests ${_testname})
+rospack_download_test_data(http://pr.willowgarage.com/data/robot_pose_ekf/ekf_test.bag test/ekf_test.bag)


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.