Revision: 8668
http://playerstage.svn.sourceforge.net/playerstage/?rev=8668&view=rev
Author: hsujohnhsu
Date: 2010-05-11 07:21:33 +0000 (Tue, 11 May 2010)
Log Message:
-----------
fix compile
Modified Paths:
--------------
code/gazebo/trunk/benchmarks/CMakeLists.txt
code/gazebo/trunk/benchmarks/box_grid_benchmark.cc
code/gazebo/trunk/benchmarks/box_pile_benchmark.cc
code/gazebo/trunk/benchmarks/camera_benchmark.cc
code/gazebo/trunk/benchmarks/joint_chain_benchmark.cc
code/gazebo/trunk/benchmarks/laser_benchmark.cc
Modified: code/gazebo/trunk/benchmarks/CMakeLists.txt
===================================================================
--- code/gazebo/trunk/benchmarks/CMakeLists.txt 2010-05-06 20:07:00 UTC (rev
8667)
+++ code/gazebo/trunk/benchmarks/CMakeLists.txt 2010-05-11 07:21:33 UTC (rev
8668)
@@ -9,15 +9,15 @@
include (FindPkgConfig)
-if (PKG_CONFIG_FOUND)
- pkg_check_modules(PKG_CFGS REQUIRED libgazebo)
- set (INCLUDE_DIRS ${PKG_CFGS_INCLUDE_DIRS})
- set (LINK_DIRS ${PKG_CFGS_LIBRARY_DIRS})
- set (LINK_LIBS ${PKG_CFGS_LINK_LIBS} ${PKG_CFGS_LIBRARIES})
-endif (PKG_CONFIG_FOUND)
+# if (PKG_CONFIG_FOUND)
+# pkg_check_modules(PKG_CFGS REQUIRED libgazebo)
+# set (INCLUDE_DIRS ${PKG_CFGS_INCLUDE_DIRS})
+# set (LINK_DIRS ${PKG_CFGS_LIBRARY_DIRS})
+# set (LINK_LIBS ${PKG_CFGS_LINK_LIBS} ${PKG_CFGS_LIBRARIES})
+# endif (PKG_CONFIG_FOUND)
-include_directories( ${INCLUDE_DIRS} )
-link_directories( ${LINK_DIRS} )
+link_directories(../libgazebo ${INCLUDE_DIRS})
+include_directories(../libgazebo ${LINK_DIRS})
include_directories(.)
@@ -35,8 +35,24 @@
add_executable(joint_chain_benchmark joint_chain_benchmark.cc)
add_executable(camera_benchmark camera_benchmark.cc)
-target_link_libraries(laser_benchmark ${LINK_LIBS} )
-target_link_libraries(box_grid_benchmark ${LINK_LIBS} )
-target_link_libraries(box_pile_benchmark ${LINK_LIBS} )
-target_link_libraries(joint_chain_benchmark ${LINK_LIBS} )
-target_link_libraries(camera_benchmark ${LINK_LIBS} )
+target_link_libraries(laser_benchmark gazebo ${LINK_LIBS} )
+target_link_libraries(box_grid_benchmark gazebo ${LINK_LIBS} )
+target_link_libraries(box_pile_benchmark gazebo ${LINK_LIBS} )
+target_link_libraries(joint_chain_benchmark gazebo ${LINK_LIBS} )
+target_link_libraries(camera_benchmark gazebo ${LINK_LIBS} )
+
+set_target_properties(laser_benchmark PROPERTIES SKIP_BUILD_RPATH TRUE)
+set_target_properties(box_grid_benchmark PROPERTIES SKIP_BUILD_RPATH TRUE)
+set_target_properties(box_pile_benchmark PROPERTIES SKIP_BUILD_RPATH TRUE)
+set_target_properties(joint_chain_benchmark PROPERTIES SKIP_BUILD_RPATH TRUE)
+set_target_properties(camera_benchmark PROPERTIES SKIP_BUILD_RPATH TRUE)
+
+set_target_properties(laser_benchmark PROPERTIES LINK_FLAGS
"${LINK_FLAGS} ${gazebo_lflags}")
+set_target_properties(box_grid_benchmark PROPERTIES LINK_FLAGS
"${LINK_FLAGS} ${gazebo_lflags}")
+set_target_properties(box_pile_benchmark PROPERTIES LINK_FLAGS
"${LINK_FLAGS} ${gazebo_lflags}")
+set_target_properties(joint_chain_benchmark PROPERTIES LINK_FLAGS
"${LINK_FLAGS} ${gazebo_lflags}")
+set_target_properties(camera_benchmark PROPERTIES LINK_FLAGS
"${LINK_FLAGS} ${gazebo_lflags}")
+
+install (TARGETS laser_benchmark box_grid_benchmark box_pile_benchmark
joint_chain_benchmark camera_benchmark DESTINATION ${CMAKE_INSTALL_PREFIX}/bin)
+
+
Modified: code/gazebo/trunk/benchmarks/box_grid_benchmark.cc
===================================================================
--- code/gazebo/trunk/benchmarks/box_grid_benchmark.cc 2010-05-06 20:07:00 UTC
(rev 8667)
+++ code/gazebo/trunk/benchmarks/box_grid_benchmark.cc 2010-05-11 07:21:33 UTC
(rev 8668)
@@ -2,7 +2,7 @@
#include <stdio.h>
#include <stdlib.h>
#include <vector>
-#include <gazebo/gazebo.h>
+#include <libgazebo/gz.h>
gazebo::Client *client = NULL;
gazebo::SimulationIface *simIface = NULL;
Modified: code/gazebo/trunk/benchmarks/box_pile_benchmark.cc
===================================================================
--- code/gazebo/trunk/benchmarks/box_pile_benchmark.cc 2010-05-06 20:07:00 UTC
(rev 8667)
+++ code/gazebo/trunk/benchmarks/box_pile_benchmark.cc 2010-05-11 07:21:33 UTC
(rev 8668)
@@ -2,7 +2,7 @@
#include <stdio.h>
#include <stdlib.h>
#include <vector>
-#include <gazebo/gazebo.h>
+#include <libgazebo/gz.h>
gazebo::Client *client = NULL;
gazebo::SimulationIface *simIface = NULL;
Modified: code/gazebo/trunk/benchmarks/camera_benchmark.cc
===================================================================
--- code/gazebo/trunk/benchmarks/camera_benchmark.cc 2010-05-06 20:07:00 UTC
(rev 8667)
+++ code/gazebo/trunk/benchmarks/camera_benchmark.cc 2010-05-11 07:21:33 UTC
(rev 8668)
@@ -2,7 +2,7 @@
#include <stdio.h>
#include <stdlib.h>
#include <vector>
-#include <gazebo/gazebo.h>
+#include <libgazebo/gz.h>
gazebo::Client *client = NULL;
gazebo::SimulationIface *simIface = NULL;
Modified: code/gazebo/trunk/benchmarks/joint_chain_benchmark.cc
===================================================================
--- code/gazebo/trunk/benchmarks/joint_chain_benchmark.cc 2010-05-06
20:07:00 UTC (rev 8667)
+++ code/gazebo/trunk/benchmarks/joint_chain_benchmark.cc 2010-05-11
07:21:33 UTC (rev 8668)
@@ -2,7 +2,7 @@
#include <stdio.h>
#include <stdlib.h>
#include <vector>
-#include <gazebo/gazebo.h>
+#include <libgazebo/gz.h>
gazebo::Client *client = NULL;
gazebo::SimulationIface *simIface = NULL;
@@ -144,8 +144,8 @@
/// Wait .1 seconds
usleep(100000);
}
- strcpy( (char*)factoryIface->data->deleteModel, "joint_model");
- while ( strcmp((char*)factoryIface->data->deleteModel, "") != 0)
+ strcpy( (char*)factoryIface->data->deleteEntity, "joint_model");
+ while ( strcmp((char*)factoryIface->data->deleteEntity, "") != 0)
usleep(10000);
double percent = simTime / realTime;
Modified: code/gazebo/trunk/benchmarks/laser_benchmark.cc
===================================================================
--- code/gazebo/trunk/benchmarks/laser_benchmark.cc 2010-05-06 20:07:00 UTC
(rev 8667)
+++ code/gazebo/trunk/benchmarks/laser_benchmark.cc 2010-05-11 07:21:33 UTC
(rev 8668)
@@ -2,7 +2,7 @@
#include <stdio.h>
#include <stdlib.h>
#include <vector>
-#include <gazebo/gazebo.h>
+#include <libgazebo/gz.h>
gazebo::Client *client = NULL;
gazebo::SimulationIface *simIface = NULL;
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
_______________________________________________
Playerstage-commit mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/playerstage-commit
