Revision: 8705
http://playerstage.svn.sourceforge.net/playerstage/?rev=8705&view=rev
Author: natepak
Date: 2010-05-21 19:01:35 +0000 (Fri, 21 May 2010)
Log Message:
-----------
Fixed profiling
Modified Paths:
--------------
code/gazebo/branches/tbb/CMakeLists.txt
code/gazebo/branches/tbb/cmake/SearchForStuff.cmake
code/gazebo/branches/tbb/server/CMakeLists.txt
code/gazebo/branches/tbb/server/audio_video/CMakeLists.txt
code/gazebo/branches/tbb/server/gui/CMakeLists.txt
code/gazebo/branches/tbb/server/physics/CMakeLists.txt
code/gazebo/branches/tbb/server/physics/bullet/CMakeLists.txt
code/gazebo/branches/tbb/server/physics/ode/CMakeLists.txt
code/gazebo/branches/tbb/server/rendering/CMakeLists.txt
Modified: code/gazebo/branches/tbb/CMakeLists.txt
===================================================================
--- code/gazebo/branches/tbb/CMakeLists.txt 2010-05-21 17:16:22 UTC (rev
8704)
+++ code/gazebo/branches/tbb/CMakeLists.txt 2010-05-21 19:01:35 UTC (rev
8705)
@@ -61,13 +61,13 @@
# Build type cflags
SET (CMAKE_C_FLAGS_RELEASE " -O2 -DNDEBUG -Wall -fPIC " CACHE INTERNAL "C
Flags for release" FORCE)
SET (CMAKE_C_FLAGS_DEBUG " -ggdb -Wall -fPIC " CACHE INTERNAL "C Flags for
debug" FORCE)
-SET (CMAKE_C_FLAGS_PROFILE " -ggdb -pg -Wall -fPIC " CACHE INTERNAL "C Flags
for profile" FORCE)
+SET (CMAKE_C_FLAGS_PROFILE " -g -pg -Wall -fPIC " CACHE INTERNAL "C Flags for
profile" FORCE)
#####################################
# Build type link flags
SET (CMAKE_LINK_FLAGS_RELEASE "" CACHE INTERNAL "Link flags fro release" FORCE)
SET (CMAKE_LINK_FLAGS_DEBUG "" CACHE INTERNAL "Link flags for debug" FORCE)
-SET (CMAKE_LINK_FLAGS_PROFILE "" CACHE INTERNAL "Link flags for profile" FORCE)
+SET (CMAKE_LINK_FLAGS_PROFILE "-pg" CACHE INTERNAL "Link flags for profile"
FORCE)
#####################################
# Set the default build type
Modified: code/gazebo/branches/tbb/cmake/SearchForStuff.cmake
===================================================================
--- code/gazebo/branches/tbb/cmake/SearchForStuff.cmake 2010-05-21 17:16:22 UTC
(rev 8704)
+++ code/gazebo/branches/tbb/cmake/SearchForStuff.cmake 2010-05-21 19:01:35 UTC
(rev 8705)
@@ -339,11 +339,11 @@
########################################
# Find profiler library, optional
-FIND_LIBRARY(PROFILER "profiler")
-IF (PROFILER)
- SET (CMAKE_LINK_FLAGS_PROFILE "${CMAKE_LINK_FLAGS_PROFILE} -lprofiler"
- CACHE INTERNAL "Link flags for profile" FORCE)
-ENDIF (PROFILER)
+#FIND_LIBRARY(PROFILER "profiler")
+#IF (PROFILER)
+# SET (CMAKE_LINK_FLAGS_PROFILE "${CMAKE_LINK_FLAGS_PROFILE} -lprofiler"
+# CACHE INTERNAL "Link flags for profile" FORCE)
+#ENDIF (PROFILER)
########################################
# Find tcmalloc library, optional
Modified: code/gazebo/branches/tbb/server/CMakeLists.txt
===================================================================
--- code/gazebo/branches/tbb/server/CMakeLists.txt 2010-05-21 17:16:22 UTC
(rev 8704)
+++ code/gazebo/branches/tbb/server/CMakeLists.txt 2010-05-21 19:01:35 UTC
(rev 8705)
@@ -147,9 +147,12 @@
if (CMAKE_LINK_FLAGS_${CMAKE_BUILD_TYPE})
set_source_files_properties(${gazeboserver_sources} PROPERTIES LINK_FLAGS
${CMAKE_LINK_FLAGS_${CMAKE_BUILD_TYPE}})
+ set_target_properties( gazebo-exec PROPERTIES LINK_FLAGS "${LINK_FLAGS}
${gazebo_lflags} ${CMAKE_LINK_FLAGS_${CMAKE_BUILD_TYPE}}")
+
+else (CMAKE_LINK_FLAGS_${CMAKE_BUILD_TYPE})
+ set_target_properties( gazebo-exec PROPERTIES LINK_FLAGS "${LINK_FLAGS}
${gazebo_lflags}")
endif (CMAKE_LINK_FLAGS_${CMAKE_BUILD_TYPE})
-set_target_properties( gazebo-exec PROPERTIES LINK_FLAGS "${LINK_FLAGS}
${gazebo_lflags}")
target_link_libraries( gazebo-exec ${libtool_library}
${gazeboserver_link_libs}
Modified: code/gazebo/branches/tbb/server/audio_video/CMakeLists.txt
===================================================================
--- code/gazebo/branches/tbb/server/audio_video/CMakeLists.txt 2010-05-21
17:16:22 UTC (rev 8704)
+++ code/gazebo/branches/tbb/server/audio_video/CMakeLists.txt 2010-05-21
19:01:35 UTC (rev 8705)
@@ -14,6 +14,13 @@
OpenAL.hh
)
+set_source_files_properties(${sources} PROPERTIES COMPILE_FLAGS
"${GAZEBO_CFLAGS} ${CMAKE_C_FLAGS_${CMAKE_BUILD_TYPE}}")
+
+if (CMAKE_LINK_FLAGS_${CMAKE_BUILD_TYPE})
+ set_source_files_properties(${sources} PROPERTIES LINK_FLAGS
${CMAKE_LINK_FLAGS_${CMAKE_BUILD_TYPE}})
+endif (CMAKE_LINK_FLAGS_${CMAKE_BUILD_TYPE})
+
+
#ADD_LIBRARY(gazebo_av STATIC ${sources})
ADD_LIBRARY(gazebo_av-shared SHARED ${sources})
Modified: code/gazebo/branches/tbb/server/gui/CMakeLists.txt
===================================================================
--- code/gazebo/branches/tbb/server/gui/CMakeLists.txt 2010-05-21 17:16:22 UTC
(rev 8704)
+++ code/gazebo/branches/tbb/server/gui/CMakeLists.txt 2010-05-21 19:01:35 UTC
(rev 8705)
@@ -53,6 +53,11 @@
set_source_files_properties(${sources} PROPERTIES COMPILE_FLAGS
"${GAZEBO_CFLAGS} ${CMAKE_C_FLAGS_${CMAKE_BUILD_TYPE}}")
+if (CMAKE_LINK_FLAGS_${CMAKE_BUILD_TYPE})
+ set_source_files_properties(${sources} PROPERTIES LINK_FLAGS
${CMAKE_LINK_FLAGS_${CMAKE_BUILD_TYPE}})
+endif (CMAKE_LINK_FLAGS_${CMAKE_BUILD_TYPE})
+
+
add_library(gazebo_gui SHARED ${sources})
target_link_libraries(gazebo_gui ${FLTK_LIBRARIES} Xpm)
Modified: code/gazebo/branches/tbb/server/physics/CMakeLists.txt
===================================================================
--- code/gazebo/branches/tbb/server/physics/CMakeLists.txt 2010-05-21
17:16:22 UTC (rev 8704)
+++ code/gazebo/branches/tbb/server/physics/CMakeLists.txt 2010-05-21
19:01:35 UTC (rev 8705)
@@ -54,6 +54,12 @@
JointFeedback.hh
)
+set_source_files_properties(${sources} PROPERTIES COMPILE_FLAGS
"${GAZEBO_CFLAGS} ${CMAKE_C_FLAGS_${CMAKE_BUILD_TYPE}}")
+
+if (CMAKE_LINK_FLAGS_${CMAKE_BUILD_TYPE})
+ set_source_files_properties(${sources} PROPERTIES LINK_FLAGS
${CMAKE_LINK_FLAGS_${CMAKE_BUILD_TYPE}})
+endif (CMAKE_LINK_FLAGS_${CMAKE_BUILD_TYPE})
+
add_library(gazebo_physics SHARED ${sources})
install ( TARGETS gazebo_physics DESTINATION ${CMAKE_INSTALL_PREFIX}/lib )
#APPEND_TO_SERVER_SOURCES(${sources})
Modified: code/gazebo/branches/tbb/server/physics/bullet/CMakeLists.txt
===================================================================
--- code/gazebo/branches/tbb/server/physics/bullet/CMakeLists.txt
2010-05-21 17:16:22 UTC (rev 8704)
+++ code/gazebo/branches/tbb/server/physics/bullet/CMakeLists.txt
2010-05-21 19:01:35 UTC (rev 8705)
@@ -60,7 +60,14 @@
)
+set_source_files_properties(${sources} PROPERTIES COMPILE_FLAGS
"${GAZEBO_CFLAGS} ${CMAKE_C_FLAGS_${CMAKE_BUILD_TYPE}}")
+if (CMAKE_LINK_FLAGS_${CMAKE_BUILD_TYPE})
+ set_source_files_properties(${sources} PROPERTIES LINK_FLAGS
${CMAKE_LINK_FLAGS_${CMAKE_BUILD_TYPE}})
+endif (CMAKE_LINK_FLAGS_${CMAKE_BUILD_TYPE})
+
+
+
add_definitions(${bullet_cflags})
#add_definitions(mDBT_USE_DOUBLE_PRECISION -DBT_EULER_DEFAULT_ZYX)
add_library(gazebo_physics_bullet SHARED ${sources})
Modified: code/gazebo/branches/tbb/server/physics/ode/CMakeLists.txt
===================================================================
--- code/gazebo/branches/tbb/server/physics/ode/CMakeLists.txt 2010-05-21
17:16:22 UTC (rev 8704)
+++ code/gazebo/branches/tbb/server/physics/ode/CMakeLists.txt 2010-05-21
19:01:35 UTC (rev 8705)
@@ -30,6 +30,12 @@
ODEHeightmapShape.hh
)
+set_source_files_properties(${sources} PROPERTIES COMPILE_FLAGS
"${GAZEBO_CFLAGS} ${CMAKE_C_FLAGS_${CMAKE_BUILD_TYPE}}")
+
+if (CMAKE_LINK_FLAGS_${CMAKE_BUILD_TYPE})
+ set_source_files_properties(${sources} PROPERTIES LINK_FLAGS
${CMAKE_LINK_FLAGS_${CMAKE_BUILD_TYPE}})
+endif (CMAKE_LINK_FLAGS_${CMAKE_BUILD_TYPE})
+
add_library(gazebo_physics_ode SHARED ${sources})
set_target_properties(gazebo_physics_ode PROPERTIES COMPILE_FLAGS "-fPIC")
target_link_libraries( gazebo_physics_ode ${ODE_LIBRARIES})
Modified: code/gazebo/branches/tbb/server/rendering/CMakeLists.txt
===================================================================
--- code/gazebo/branches/tbb/server/rendering/CMakeLists.txt 2010-05-21
17:16:22 UTC (rev 8704)
+++ code/gazebo/branches/tbb/server/rendering/CMakeLists.txt 2010-05-21
19:01:35 UTC (rev 8705)
@@ -51,6 +51,12 @@
OrbitViewController.hh
)
+set_source_files_properties(${sources} PROPERTIES COMPILE_FLAGS
"${GAZEBO_CFLAGS} ${CMAKE_C_FLAGS_${CMAKE_BUILD_TYPE}}")
+
+if (CMAKE_LINK_FLAGS_${CMAKE_BUILD_TYPE})
+ set_source_files_properties(${sources} PROPERTIES LINK_FLAGS
${CMAKE_LINK_FLAGS_${CMAKE_BUILD_TYPE}})
+endif (CMAKE_LINK_FLAGS_${CMAKE_BUILD_TYPE})
+
add_library(gazebo_rendering SHARED ${sources})
target_link_libraries( gazebo_rendering ${OGRE_LIBRARIES} X11)
install ( TARGETS gazebo_rendering DESTINATION ${CMAKE_INSTALL_PREFIX}/lib )
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
