From 552dbf118db6dfce197a67f16077b7279e9f8c26 Mon Sep 17 00:00:00 2001 From: Nate Koenig Date: Wed, 29 Oct 2014 10:22:52 -0700 Subject: [PATCH 1/4] Fix cmake to include all models --- CMakeLists.txt | 43 +++++++++++++++++++++++++++++++++---------- 1 file changed, 33 insertions(+), 10 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 8d11d33..7704232 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -14,6 +14,7 @@ exec_program(date ARGS -u +%Y-%m-%-dT%H:%M:%S OUTPUT_VARIABLE CURRENT_DATE) set (dirs asphalt_plane +ball_bearing beer bookshelf bowl @@ -21,6 +22,9 @@ breakable_test brick_box_3x1x3 cabinet camera +cart_front_steer +cart_rigid_suspension +cart_soft_suspension cinder_block cinder_block_2 cinder_block_wide @@ -49,10 +53,12 @@ drc_practice_handle_wheel_valve drc_practice_handle_wheel_valve_wall drc_practice_hand_wheel_valve drc_practice_hand_wheel_valve_wall +drc_practice_hinged_door drc_practice_ladder drc_practice_orange_jersey_barrier drc_practice_truss drc_practice_valve_wall +drc_practice_weighted_door drc_practice_wheel_valve drc_practice_wheel_valve_large drc_practice_wheel_valve_large_wall @@ -81,8 +87,17 @@ iss_half jersey_barrier kinect kitchen_dining +ladder_60deg_0rails +ladder_60deg_1rails +ladder_60deg_2rails +ladder_75deg_0rails +ladder_75deg_1rails +ladder_75deg_2rails lamp_post mailbox +marble_1_5cm +metal_peg +metal_peg_board monkey_wrench mud_box nist_elevated_floor_120 @@ -95,47 +110,55 @@ nist_stairs_120 office_building pioneer2dx pioneer3at +plastic_cup polaris_ranger_ev polaris_ranger_xp900 polaris_ranger_xp900_no_roll_cage powerplant pr2 pr2_gripper +quadrotor +ragdoll +robocup09_spl_field +robocup14_spl_field +robocup14_spl_goal robocup_3Dsim_ball robocup_3Dsim_field robocup_3Dsim_goal robocup_spl_ball -robocup09_spl_field -robocup14_spl_field -robocup14_spl_goal robonaut +round_tin_base +round_tin_top saucepan simple_arm simple_arm_gripper simple_gripper speed_limit_sign +standpipe starting_pen stereo_camera +stone_10_2_5_1cm stop_sign sun table table_marble +tmp +tube_2_25cm +tube_9_5mm turtlebot utility_cart -willowgarage washer +willowgarage wood_block_10_2_1cm wood_cube_10cm wood_cube_2_5cm wood_cube_5cm wood_cube_7_5cm +wooden_board +wooden_case +wooden_peg +wooden_peg_board 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) From d5ab39ec54f8282a289a797e294899bf6541e44e Mon Sep 17 00:00:00 2001 From: Nate Koenig Date: Wed, 29 Oct 2014 10:37:39 -0700 Subject: [PATCH 2/4] Added Steve's check install shell script --- check_install.bash | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100755 check_install.bash diff --git a/check_install.bash b/check_install.bash new file mode 100755 index 0000000..8b29407 --- /dev/null +++ b/check_install.bash @@ -0,0 +1,7 @@ +for i in `ls` +do + for j in `grep -L "^$i$" CMakeLists.txt` + do + echo $i + done +done From aaf8e3505cc15add5886dcba8215514bd92ba500 Mon Sep 17 00:00:00 2001 From: Nathan Koenig Date: Wed, 29 Oct 2014 10:50:37 -0700 Subject: [PATCH 3/4] Close branch fix_cmake From 03b142173de935610740e2794b280346897a1a63 Mon Sep 17 00:00:00 2001 From: Nate Koenig Date: Wed, 29 Oct 2014 10:56:33 -0700 Subject: [PATCH 4/4] Removed tmp install --- CMakeLists.txt | 1 - 1 file changed, 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 7704232..0529d88 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -142,7 +142,6 @@ stop_sign sun table table_marble -tmp tube_2_25cm tube_9_5mm turtlebot