Revision: 8226
http://playerstage.svn.sourceforge.net/playerstage/?rev=8226&view=rev
Author: hsujohnhsu
Date: 2009-08-26 06:09:46 +0000 (Wed, 26 Aug 2009)
Log Message:
-----------
pass through ODE flags for DdSINGLE or DdDOUBLE.
Modified Paths:
--------------
code/gazebo/trunk/cmake/FindOde.cmake
code/gazebo/trunk/server/gui/CMakeLists.txt
Modified: code/gazebo/trunk/cmake/FindOde.cmake
===================================================================
--- code/gazebo/trunk/cmake/FindOde.cmake 2009-08-26 06:08:55 UTC (rev
8225)
+++ code/gazebo/trunk/cmake/FindOde.cmake 2009-08-26 06:09:46 UTC (rev
8226)
@@ -36,6 +36,15 @@
IF (NOT ODE_FOUND)
MESSAGE (SEND_ERROR "\nError: ODE and development files not found. See the
following website: http://www.ode.org";)
ELSE (NOT ODE_FOUND)
+ #SET (CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} ${ODE_CFLAGS_OTHER}"
CACHE INTERNAL "added dSINGLE" FORCE)
+ #SET (CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} ${ODE_CFLAGS_OTHER}"
CACHE INTERNAL "added dSINGLE" FORCE)
+ #SET (CMAKE_C_FLAGS_PROFILE "${CMAKE_C_FLAGS_PROFILE} ${ODE_CFLAGS_OTHER}"
CACHE INTERNAL "added dSINGLE" FORCE)
+ #MESSAGE (STATUS "\n\ndebug\n" ${CMAKE_C_FLAGS_DEBUG} "\n\n")
+
+ APPEND_TO_CACHED_LIST(gazeboserver_cflags
+ ${gazeboserver_cflags_desc}
+ ${ODE_CFLAGS_OTHER})
+
APPEND_TO_CACHED_LIST(gazeboserver_include_dirs
${gazeboserver_include_dirs_desc}
${ODE_INCLUDE_DIRS})
Modified: code/gazebo/trunk/server/gui/CMakeLists.txt
===================================================================
--- code/gazebo/trunk/server/gui/CMakeLists.txt 2009-08-26 06:08:55 UTC (rev
8225)
+++ code/gazebo/trunk/server/gui/CMakeLists.txt 2009-08-26 06:09:46 UTC (rev
8226)
@@ -1,3 +1,5 @@
+INCLUDE (${gazebo_cmake_dir}/GazeboUtils.cmake)
+
SET (sources Gui.cc
GLWindow.cc
MainMenu.cc
@@ -16,6 +18,9 @@
GLFrame.hh
)
+LIST_TO_STRING(GAZEBO_CFLAGS "${gazeboserver_cflags}")
+SET_SOURCE_FILES_PROPERTIES(${sources} PROPERTIES COMPILE_FLAGS
"${GAZEBO_CFLAGS} ${CMAKE_C_FLAGS_${CMAKE_BUILD_TYPE}}")
+
#ADD_LIBRARY(gazebo_gui STATIC ${sources})
ADD_LIBRARY(gazebo_gui-shared SHARED ${sources})
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Let Crystal Reports handle the reporting - Free Crystal Reports 2008 30-Day
trial. Simplify your report design, integration and deployment - and focus on
what you do best, core application coding. Discover what's new with
Crystal Reports now. http://p.sf.net/sfu/bobj-july
_______________________________________________
Playerstage-commit mailing list
Playerstage-commit@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/playerstage-commit
