Revision: 8709
http://playerstage.svn.sourceforge.net/playerstage/?rev=8709&view=rev
Author: natepak
Date: 2010-05-23 05:03:45 +0000 (Sun, 23 May 2010)
Log Message:
-----------
Updated cmake
Modified Paths:
--------------
code/gazebo/trunk/libgazebo/CMakeLists.txt
code/gazebo/trunk/libgazebo/gz.h
code/gazebo/trunk/server/CMakeLists.txt
code/gazebo/trunk/server/GraphicsIfaceHandler.cc
code/gazebo/trunk/server/audio_video/CMakeLists.txt
code/gazebo/trunk/server/gui/CMakeLists.txt
code/gazebo/trunk/server/physics/CMakeLists.txt
code/gazebo/trunk/server/physics/bullet/CMakeLists.txt
code/gazebo/trunk/server/physics/ode/CMakeLists.txt
code/gazebo/trunk/server/rendering/CMakeLists.txt
Modified: code/gazebo/trunk/libgazebo/CMakeLists.txt
===================================================================
--- code/gazebo/trunk/libgazebo/CMakeLists.txt 2010-05-22 21:47:48 UTC (rev
8708)
+++ code/gazebo/trunk/libgazebo/CMakeLists.txt 2010-05-23 05:03:45 UTC (rev
8709)
@@ -20,6 +20,14 @@
add_library(gazeboshm SHARED ${sources})
set_target_properties(gazeboshm PROPERTIES OUTPUT_NAME "gazebo" VERSION
${GAZEBO_VERSION})
+if (CMAKE_LINK_FLAGS_${CMAKE_BUILD_TYPE})
+ set_source_files_properties(${sources} PROPERTIES LINK_FLAGS
+ ${CMAKE_LINK_FLAGS_${CMAKE_BUILD_TYPE}})
+ set_target_properties(gazeboshm PROPERTIES LINK_FLAGS
+ ${CMAKE_LINK_FLAGS_${CMAKE_BUILD_TYPE}})
+endif (CMAKE_LINK_FLAGS_${CMAKE_BUILD_TYPE})
+
+
target_link_libraries( gazeboshm ${boost_libraries})
install (TARGETS gazeboshm DESTINATION ${CMAKE_INSTALL_PREFIX}/lib)
Modified: code/gazebo/trunk/libgazebo/gz.h
===================================================================
--- code/gazebo/trunk/libgazebo/gz.h 2010-05-22 21:47:48 UTC (rev 8708)
+++ code/gazebo/trunk/libgazebo/gz.h 2010-05-23 05:03:45 UTC (rev 8709)
@@ -918,7 +918,7 @@
/// Maximum number of points that can be drawn
#define GAZEBO_GRAPHICS3D_MAX_POINTS 1024
#define GAZEBO_GRAPHICS3D_MAX_NAME 128
-#define GAZEBO_GRAPHICS3D_MAX_COMMANDS 128
+#define GAZEBO_GRAPHICS3D_MAX_COMMANDS 64
class Graphics3dDrawData
{
Modified: code/gazebo/trunk/server/CMakeLists.txt
===================================================================
--- code/gazebo/trunk/server/CMakeLists.txt 2010-05-22 21:47:48 UTC (rev
8708)
+++ code/gazebo/trunk/server/CMakeLists.txt 2010-05-23 05:03:45 UTC (rev
8709)
@@ -147,9 +147,11 @@
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/trunk/server/GraphicsIfaceHandler.cc
===================================================================
--- code/gazebo/trunk/server/GraphicsIfaceHandler.cc 2010-05-22 21:47:48 UTC
(rev 8708)
+++ code/gazebo/trunk/server/GraphicsIfaceHandler.cc 2010-05-23 05:03:45 UTC
(rev 8709)
@@ -45,7 +45,6 @@
GraphicsIfaceHandler::GraphicsIfaceHandler()
{
this->threeDIface = NULL;
-
}
////////////////////////////////////////////////////////////////////////////////
@@ -56,6 +55,7 @@
{
this->threeDIface->Close();
delete this->threeDIface;
+ this->threeDIface = NULL;
}
}
Modified: code/gazebo/trunk/server/audio_video/CMakeLists.txt
===================================================================
--- code/gazebo/trunk/server/audio_video/CMakeLists.txt 2010-05-22 21:47:48 UTC
(rev 8708)
+++ code/gazebo/trunk/server/audio_video/CMakeLists.txt 2010-05-23 05:03:45 UTC
(rev 8709)
@@ -17,6 +17,15 @@
#ADD_LIBRARY(gazebo_av STATIC ${sources})
ADD_LIBRARY(gazebo_av-shared SHARED ${sources})
+
+if (CMAKE_LINK_FLAGS_${CMAKE_BUILD_TYPE})
+ set_source_files_properties(${sources} PROPERTIES LINK_FLAGS
+ ${CMAKE_LINK_FLAGS_${CMAKE_BUILD_TYPE}})
+ set_target_properties(gazebo_av-shared PROPERTIES LINK_FLAGS
+ ${CMAKE_LINK_FLAGS_${CMAKE_BUILD_TYPE}})
+endif (CMAKE_LINK_FLAGS_${CMAKE_BUILD_TYPE})
+
+
#TARGET_LINK_LIBRARIES(gazebo_av ${OAL_LIBRARIES} ${AVC_LIBRARIES}
${AVF_LIBRARIES})
TARGET_LINK_LIBRARIES(gazebo_av-shared ${OAL_LIBRARIES} ${AVC_LIBRARIES}
${AVF_LIBRARIES})
Modified: code/gazebo/trunk/server/gui/CMakeLists.txt
===================================================================
--- code/gazebo/trunk/server/gui/CMakeLists.txt 2010-05-22 21:47:48 UTC (rev
8708)
+++ code/gazebo/trunk/server/gui/CMakeLists.txt 2010-05-23 05:03:45 UTC (rev
8709)
@@ -57,6 +57,13 @@
target_link_libraries(gazebo_gui ${FLTK_LIBRARIES} Xpm)
+if (CMAKE_LINK_FLAGS_${CMAKE_BUILD_TYPE})
+ set_source_files_properties(${sources} PROPERTIES LINK_FLAGS
+ ${CMAKE_LINK_FLAGS_${CMAKE_BUILD_TYPE}})
+ set_target_properties(gazebo_gui PROPERTIES LINK_FLAGS
+ ${CMAKE_LINK_FLAGS_${CMAKE_BUILD_TYPE}})
+endif (CMAKE_LINK_FLAGS_${CMAKE_BUILD_TYPE})
+
set_target_properties(gazebo_gui PROPERTIES OUTPUT_NAME "gazebo_gui" VERSION
${GAZEBO_VERSION})
install (TARGETS gazebo_gui DESTINATION ${CMAKE_INSTALL_PREFIX}/lib)
Modified: code/gazebo/trunk/server/physics/CMakeLists.txt
===================================================================
--- code/gazebo/trunk/server/physics/CMakeLists.txt 2010-05-22 21:47:48 UTC
(rev 8708)
+++ code/gazebo/trunk/server/physics/CMakeLists.txt 2010-05-23 05:03:45 UTC
(rev 8709)
@@ -55,6 +55,14 @@
)
add_library(gazebo_physics SHARED ${sources})
+
+if (CMAKE_LINK_FLAGS_${CMAKE_BUILD_TYPE})
+ set_source_files_properties(${sources} PROPERTIES LINK_FLAGS
+ ${CMAKE_LINK_FLAGS_${CMAKE_BUILD_TYPE}})
+ set_target_properties(gazebo_physics PROPERTIES LINK_FLAGS
+ ${CMAKE_LINK_FLAGS_${CMAKE_BUILD_TYPE}})
+endif (CMAKE_LINK_FLAGS_${CMAKE_BUILD_TYPE})
+
install ( TARGETS gazebo_physics DESTINATION ${CMAKE_INSTALL_PREFIX}/lib )
#APPEND_TO_SERVER_SOURCES(${sources})
APPEND_TO_SERVER_HEADERS(${headers})
Modified: code/gazebo/trunk/server/physics/bullet/CMakeLists.txt
===================================================================
--- code/gazebo/trunk/server/physics/bullet/CMakeLists.txt 2010-05-22
21:47:48 UTC (rev 8708)
+++ code/gazebo/trunk/server/physics/bullet/CMakeLists.txt 2010-05-23
05:03:45 UTC (rev 8709)
@@ -59,6 +59,12 @@
#BulletRayGeom.cc
)
+if (CMAKE_LINK_FLAGS_${CMAKE_BUILD_TYPE})
+ set_source_files_properties(${sources} PROPERTIES LINK_FLAGS
+ ${CMAKE_LINK_FLAGS_${CMAKE_BUILD_TYPE}})
+ set_target_properties(gazebo_physics_bullet PROPERTIES LINK_FLAGS
+ ${CMAKE_LINK_FLAGS_${CMAKE_BUILD_TYPE}})
+endif (CMAKE_LINK_FLAGS_${CMAKE_BUILD_TYPE})
add_definitions(${bullet_cflags})
Modified: code/gazebo/trunk/server/physics/ode/CMakeLists.txt
===================================================================
--- code/gazebo/trunk/server/physics/ode/CMakeLists.txt 2010-05-22 21:47:48 UTC
(rev 8708)
+++ code/gazebo/trunk/server/physics/ode/CMakeLists.txt 2010-05-23 05:03:45 UTC
(rev 8709)
@@ -31,6 +31,14 @@
)
add_library(gazebo_physics_ode SHARED ${sources})
+
+if (CMAKE_LINK_FLAGS_${CMAKE_BUILD_TYPE})
+ set_source_files_properties(${sources} PROPERTIES LINK_FLAGS
+ ${CMAKE_LINK_FLAGS_${CMAKE_BUILD_TYPE}})
+ set_target_properties(gazebo_physics_ode PROPERTIES LINK_FLAGS
+ ${CMAKE_LINK_FLAGS_${CMAKE_BUILD_TYPE}})
+endif (CMAKE_LINK_FLAGS_${CMAKE_BUILD_TYPE})
+
set_target_properties(gazebo_physics_ode PROPERTIES COMPILE_FLAGS "-fPIC")
target_link_libraries( gazebo_physics_ode ${ODE_LIBRARIES})
install ( TARGETS gazebo_physics_ode DESTINATION ${CMAKE_INSTALL_PREFIX}/lib )
Modified: code/gazebo/trunk/server/rendering/CMakeLists.txt
===================================================================
--- code/gazebo/trunk/server/rendering/CMakeLists.txt 2010-05-22 21:47:48 UTC
(rev 8708)
+++ code/gazebo/trunk/server/rendering/CMakeLists.txt 2010-05-23 05:03:45 UTC
(rev 8709)
@@ -52,6 +52,14 @@
)
add_library(gazebo_rendering SHARED ${sources})
+
+if (CMAKE_LINK_FLAGS_${CMAKE_BUILD_TYPE})
+ set_source_files_properties(${sources} PROPERTIES LINK_FLAGS
+ ${CMAKE_LINK_FLAGS_${CMAKE_BUILD_TYPE}})
+ set_target_properties(gazebo_rendering PROPERTIES LINK_FLAGS
+ ${CMAKE_LINK_FLAGS_${CMAKE_BUILD_TYPE}})
+endif (CMAKE_LINK_FLAGS_${CMAKE_BUILD_TYPE})
+
target_link_libraries( gazebo_rendering ${OGRE_LIBRARIES} X11)
install ( TARGETS gazebo_rendering DESTINATION ${CMAKE_INSTALL_PREFIX}/lib )
APPEND_TO_SERVER_HEADERS(${headers})
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
