Revision: 7619
http://playerstage.svn.sourceforge.net/playerstage/?rev=7619&view=rev
Author: natepak
Date: 2009-05-05 01:24:49 +0000 (Tue, 05 May 2009)
Log Message:
-----------
Added creation of gazeborc to cmake
Modified Paths:
--------------
code/gazebo/trunk/CMakeLists.txt
code/gazebo/trunk/cmake/SearchForStuff.cmake
code/gazebo/trunk/server/CMakeLists.txt
Modified: code/gazebo/trunk/CMakeLists.txt
===================================================================
--- code/gazebo/trunk/CMakeLists.txt 2009-05-05 00:12:13 UTC (rev 7618)
+++ code/gazebo/trunk/CMakeLists.txt 2009-05-05 01:24:49 UTC (rev 7619)
@@ -23,7 +23,7 @@
SET (ODE_VERSION 0.10.1 CACHE INTERNAL "ODE Version Requirement")
SET (gazebo_cmake_dir ${PROJECT_SOURCE_DIR}/cmake CACHE PATH "Location of
CMake scripts")
-set (gazebo_cflags "-ggdb -g2 -Wall -fPIC" CACHE INTERNAL "Gazebo CFlags")
+SET (gazebo_cflags "-ggdb -g2 -Wall -fPIC" CACHE INTERNAL "Gazebo CFlags")
ADD_SUBDIRECTORY(libgazebo)
ADD_SUBDIRECTORY(server)
Modified: code/gazebo/trunk/cmake/SearchForStuff.cmake
===================================================================
--- code/gazebo/trunk/cmake/SearchForStuff.cmake 2009-05-05 00:12:13 UTC
(rev 7618)
+++ code/gazebo/trunk/cmake/SearchForStuff.cmake 2009-05-05 01:24:49 UTC
(rev 7619)
@@ -5,6 +5,7 @@
INCLUDE (FindPkgConfig)
SET (INCLUDE_AV ON CACHE BOOL "Include audio/video functionality" FORCE)
+SET (OGRE_LIBRARY_PATH "/usr/local/lib" CACHE INTERNAL "Ogre library path")
########################################
# Find packages
@@ -13,6 +14,8 @@
IF (NOT OGRE_FOUND)
MESSAGE (SEND_ERROR "\nError: Ogre3d and development files not found. See
the following website: http://www.orge3d.org";)
ELSE (NOT OGRE_FOUND)
+
+ SET (OGRE_LIBRARY_PATH ${OGRE_LIBRARY_DIRS} CACHE INTERNAL "Ogre library
path")
APPEND_TO_CACHED_LIST(gazeboserver_include_dirs "Include dirs"
${OGRE_INCLUDE_DIRS})
APPEND_TO_CACHED_LIST(gazeboserver_link_dirs "Link dirs"
@@ -112,15 +115,17 @@
########################################
# Find avformat and avcodec
-SET (libavformat_search_path
- /usr/include /usr/include/libavformat /usr/local/include
- /usr/local/include/libavformat
-)
-
-SET (libavcodec_search_path
- /usr/include /usr/include/libavcodec /usr/local/include
- /usr/local/include/libavcodec
-)
-
-FIND_PATH(LIBAVFORMAT_PATH avformat.h ${libavformat_search_path})
-FIND_PATH(LIBAVCODEC_PATH avcodec.h ${libavcodec_search_path})
+IF (INCLUDE_AV)
+ SET (libavformat_search_path
+ /usr/include /usr/include/libavformat /usr/local/include
+ /usr/local/include/libavformat
+ )
+
+ SET (libavcodec_search_path
+ /usr/include /usr/include/libavcodec /usr/local/include
+ /usr/local/include/libavcodec
+ )
+
+ FIND_PATH(LIBAVFORMAT_PATH avformat.h ${libavformat_search_path})
+ FIND_PATH(LIBAVCODEC_PATH avcodec.h ${libavcodec_search_path})
+ENDIF (INCLUDE_AV)
Modified: code/gazebo/trunk/server/CMakeLists.txt
===================================================================
--- code/gazebo/trunk/server/CMakeLists.txt 2009-05-05 00:12:13 UTC (rev
7618)
+++ code/gazebo/trunk/server/CMakeLists.txt 2009-05-05 01:24:49 UTC (rev
7619)
@@ -96,4 +96,9 @@
INSTALL (TARGETS gazebo DESTINATION ${CMAKE_INSTALL_PREFIX}/bin)
INSTALL (FILES ${headers} DESTINATION ${CMAKE_INSTALL_PREFIX}/include/gazebo
COMPONENT headers)
+########################################
+# Make the gazebo rc file
+CONFIGURE_FILE(${CMAKE_SOURCE_DIR}/cmake/gazeborc.cmake
${CMAKE_CURRENT_BINARY_DIR}/.gazeborc @ONLY)
+INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/.gazeborc DESTINATION ~/)
+
GAZEBOSERVER_RESET_LISTS()
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
The NEW KODAK i700 Series Scanners deliver under ANY circumstances! Your
production scanning environment may not be a perfect world - but thanks to
Kodak, there's a perfect scanner to get the job done! With the NEW KODAK i700
Series Scanner you'll get full speed at 300 dpi even with all image
processing features enabled. http://p.sf.net/sfu/kodak-com
_______________________________________________
Playerstage-commit mailing list
Playerstage-commit@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/playerstage-commit
