merge with default

This commit is contained in:
Steve Peters 2014-10-29 14:53:40 -07:00
commit 433f76a8c2
2 changed files with 39 additions and 10 deletions

View File

@ -14,6 +14,7 @@ exec_program(date ARGS -u +%Y-%m-%-dT%H:%M:%S OUTPUT_VARIABLE CURRENT_DATE)
set (dirs set (dirs
asphalt_plane asphalt_plane
ball_bearing
beer beer
bookshelf bookshelf
bowl bowl
@ -21,6 +22,9 @@ breakable_test
brick_box_3x1x3 brick_box_3x1x3
cabinet cabinet
camera camera
cart_front_steer
cart_rigid_suspension
cart_soft_suspension
cinder_block cinder_block
cinder_block_2 cinder_block_2
cinder_block_wide cinder_block_wide
@ -49,10 +53,12 @@ drc_practice_handle_wheel_valve
drc_practice_handle_wheel_valve_wall drc_practice_handle_wheel_valve_wall
drc_practice_hand_wheel_valve drc_practice_hand_wheel_valve
drc_practice_hand_wheel_valve_wall drc_practice_hand_wheel_valve_wall
drc_practice_hinged_door
drc_practice_ladder drc_practice_ladder
drc_practice_orange_jersey_barrier drc_practice_orange_jersey_barrier
drc_practice_truss drc_practice_truss
drc_practice_valve_wall drc_practice_valve_wall
drc_practice_weighted_door
drc_practice_wheel_valve drc_practice_wheel_valve
drc_practice_wheel_valve_large drc_practice_wheel_valve_large
drc_practice_wheel_valve_large_wall drc_practice_wheel_valve_large_wall
@ -81,8 +87,17 @@ iss_half
jersey_barrier jersey_barrier
kinect kinect
kitchen_dining kitchen_dining
ladder_60deg_0rails
ladder_60deg_1rails
ladder_60deg_2rails
ladder_75deg_0rails
ladder_75deg_1rails
ladder_75deg_2rails
lamp_post lamp_post
mailbox mailbox
marble_1_5cm
metal_peg
metal_peg_board
monkey_wrench monkey_wrench
mud_box mud_box
nist_elevated_floor_120 nist_elevated_floor_120
@ -95,47 +110,54 @@ nist_stairs_120
office_building office_building
pioneer2dx pioneer2dx
pioneer3at pioneer3at
plastic_cup
polaris_ranger_ev polaris_ranger_ev
polaris_ranger_xp900 polaris_ranger_xp900
polaris_ranger_xp900_no_roll_cage polaris_ranger_xp900_no_roll_cage
powerplant powerplant
pr2 pr2
pr2_gripper pr2_gripper
quadrotor
ragdoll
robocup09_spl_field
robocup14_spl_field
robocup14_spl_goal
robocup_3Dsim_ball robocup_3Dsim_ball
robocup_3Dsim_field robocup_3Dsim_field
robocup_3Dsim_goal robocup_3Dsim_goal
robocup_spl_ball robocup_spl_ball
robocup09_spl_field
robocup14_spl_field
robocup14_spl_goal
robonaut robonaut
round_tin_base
round_tin_top
saucepan saucepan
simple_arm simple_arm
simple_arm_gripper simple_arm_gripper
simple_gripper simple_gripper
speed_limit_sign speed_limit_sign
standpipe
starting_pen starting_pen
stereo_camera stereo_camera
stone_10_2_5_1cm
stop_sign stop_sign
sun sun
table table
table_marble table_marble
tube_2_25cm
tube_9_5mm
turtlebot turtlebot
utility_cart utility_cart
willowgarage
washer washer
willowgarage
wood_block_10_2_1cm wood_block_10_2_1cm
wood_cube_10cm wood_cube_10cm
wood_cube_2_5cm wood_cube_2_5cm
wood_cube_5cm wood_cube_5cm
wood_cube_7_5cm wood_cube_7_5cm
wooden_board
wooden_case
wooden_peg
wooden_peg_board
youbot youbot
ladder_60deg_0rails
ladder_60deg_1rails
ladder_60deg_2rails
ladder_75deg_0rails
ladder_75deg_1rails
ladder_75deg_2rails
) )
set (MODEL_URI_LIST "" CACHE INTERNAL "Model URI List" FORCE) set (MODEL_URI_LIST "" CACHE INTERNAL "Model URI List" FORCE)

7
check_install.bash Executable file
View File

@ -0,0 +1,7 @@
for i in `ls`
do
for j in `grep -L "^$i$" CMakeLists.txt`
do
echo $i
done
done