Revision: 8622
http://playerstage.svn.sourceforge.net/playerstage/?rev=8622&view=rev
Author: natepak
Date: 2010-04-24 22:47:52 +0000 (Sat, 24 Apr 2010)
Log Message:
-----------
Added cflags to the gazeboserver package
Modified Paths:
--------------
code/gazebo/trunk/cmake/SearchForStuff.cmake
code/gazebo/trunk/cmake/gazeboserver_pkgconfig.cmake
code/gazebo/trunk/server/CMakeLists.txt
Modified: code/gazebo/trunk/cmake/SearchForStuff.cmake
===================================================================
--- code/gazebo/trunk/cmake/SearchForStuff.cmake 2010-04-24 19:38:14 UTC
(rev 8621)
+++ code/gazebo/trunk/cmake/SearchForStuff.cmake 2010-04-24 22:47:52 UTC
(rev 8622)
@@ -56,6 +56,8 @@
set(ogre_include_dirs ${OGRE-RTShaderSystem_INCLUDE_DIRS})
set(ogre_library_dirs ${OGRE-RTShaderSystem_LIBRARY_DIRS})
set(ogre_libraries ${OGRE-RTShaderSystem_LIBRARIES})
+ set(ogre_cflags ${OGRE-RTShaderSystem_CFLAGS})
+
add_definitions(-DUSE_RTSHADER_SYSTEM)
else (OGRE-RTShaderSystem_FOUND)
@@ -68,10 +70,12 @@
set(ogre_include_dirs ${OGRE_INCLUDE_DIRS})
set(ogre_library_dirs ${OGRE_LIBRARY_DIRS})
set(ogre_libraries ${OGRE_LIBRARIES})
+ set(ogre_cflags ${OGRE_CFLAGS})
endif (NOT OGRE_FOUND)
endif (OGRE-RTShaderSystem_FOUND)
+
set (OGRE_LIBRARY_PATH ${ogre_library_dirs} CACHE INTERNAL "Ogre library
path")
APPEND_TO_CACHED_LIST(gazeboserver_include_dirs
@@ -89,8 +93,13 @@
APPEND_TO_CACHED_LIST(gazeboserver_ldflags
${gazeboserver_ldflags_desc}
${ogre_ldflags})
+ APPEND_TO_CACHED_LIST(gazeboserver_cflags
+ ${gazeboserver_cflags_desc}
+ ${ogre_cflags})
+ message(STATUS "OGRE C: ${gazeboserver_cflags}")
+
#################################################
# Find XML
pkg_check_modules(XML libxml-2.0)
@@ -112,6 +121,10 @@
APPEND_TO_CACHED_LIST(gazeboserver_ldflags
${gazeboserver_ldflags_desc}
${XML_LDFLAGS})
+ APPEND_TO_CACHED_LIST(gazeboserver_cflags
+ ${gazeboserver_cflags_desc}
+ ${XML_CFLAGS})
+
ENDIF (NOT XML_FOUND)
pkg_check_modules(XFT xft)
Modified: code/gazebo/trunk/cmake/gazeboserver_pkgconfig.cmake
===================================================================
--- code/gazebo/trunk/cmake/gazeboserver_pkgconfig.cmake 2010-04-24
19:38:14 UTC (rev 8621)
+++ code/gazebo/trunk/cmake/gazeboserver_pkgconfig.cmake 2010-04-24
22:47:52 UTC (rev 8622)
@@ -7,4 +7,4 @@
Version: @GAZEBO_VERSION@
Requires:
Libs: -L${libdir} -lgazebo_server -lgazebo @gazeboserver_ldflags@
-CFlags: -I${includedir}
+CFlags: -I${includedir} @gazeboserver_cflags@
Modified: code/gazebo/trunk/server/CMakeLists.txt
===================================================================
--- code/gazebo/trunk/server/CMakeLists.txt 2010-04-24 19:38:14 UTC (rev
8621)
+++ code/gazebo/trunk/server/CMakeLists.txt 2010-04-24 22:47:52 UTC (rev
8622)
@@ -189,8 +189,9 @@
-lgazebo_physics_ode)
endif (INCLUDE_ODE)
+STRING (REPLACE ";" " " gazeboserver_cflags "${gazeboserver_cflags}")
+STRING (REPLACE ";" " " gazeboserver_ldflags "${gazeboserver_ldflags}")
-STRING (REPLACE ";" " " gazeboserver_ldflags "${gazeboserver_ldflags}")
configure_file(${CMAKE_SOURCE_DIR}/cmake/gazeboserver_pkgconfig.cmake
${CMAKE_CURRENT_BINARY_DIR}/gazeboserver.pc @ONLY)
install(FILES ${CMAKE_CURRENT_BINARY_DIR}/gazeboserver.pc DESTINATION
${CMAKE_INSTALL_PREFIX}/lib/pkgconfig COMPONENT pkgconfig)
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
