Revision: 6812
http://playerstage.svn.sourceforge.net/playerstage/?rev=6812&view=rev
Author: rtv
Date: 2008-07-07 23:53:09 -0700 (Mon, 07 Jul 2008)
Log Message:
-----------
successfully generated, built and installed source package
Modified Paths:
--------------
code/stage/trunk/CMakeLists.txt
code/stage/trunk/INSTALL
Modified: code/stage/trunk/CMakeLists.txt
===================================================================
--- code/stage/trunk/CMakeLists.txt 2008-07-08 05:23:55 UTC (rev 6811)
+++ code/stage/trunk/CMakeLists.txt 2008-07-08 06:53:09 UTC (rev 6812)
@@ -28,8 +28,10 @@
# Create the config.h file
SET(RGBFILE ${CMAKE_INSTALL_PREFIX}/share/stage/rgb.txt )
-CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/config.h.in
${CMAKE_CURRENT_BINARY_DIR}/config.h @ONLY)
+# config.h belongs with the source (and not in CMAKE_CURRENT_BINARY_DIR as in
Brian's original version)
+CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/config.h.in
+ ${CMAKE_CURRENT_SOURCE_DIR}/config.h
@ONLY)
# find the easy modules
include(FindPkgConfig)
@@ -86,9 +88,9 @@
include_directories( .
libstage
replace
- /opt/local/include/
+ /opt/local/include/
${GLIB_INCLUDE_DIRS}
- ${LIBPNG_INCLUDE_DIRS}
+ ${LIBPNG_INCLUDE_DIRS}
${CMAKE_INCLUDE_PATH}
)
@@ -96,30 +98,29 @@
# all targets need these library directories
link_directories(${GLIB_LIBRARY_DIRS}
${LIBPNG_LIBRARY_DIRS}
- ${OPENGL_LIBRARY_DIRS}
+ ${OPENGL_LIBRARY_DIRS}
)
# work through these subdirs
ADD_SUBDIRECTORY(libstage)
-IF ( PLAYER_FOUND )
- ADD_SUBDIRECTORY(libstageplugin)
-ENDIF ( PLAYER_FOUND )
ADD_SUBDIRECTORY(examples)
ADD_SUBDIRECTORY(assets)
ADD_SUBDIRECTORY(worlds)
+IF ( PLAYER_FOUND )
+ ADD_SUBDIRECTORY(libstageplugin)
+ENDIF ( PLAYER_FOUND )
-
# generate a cpack config file used to create packaged tarballs
INCLUDE(InstallRequiredSystemLibraries)
-SET(CPACK_GENERATOR "TGZ")
-SET(CPACK_PACKAGE_DESCRIPTION_SUMMARY "Stage: A Multiple Robot Simulator")
+SET(CPACK_PACKAGE_DESCRIPTION_SUMMARY "${PROJECT_NAME}: A Multiple Robot
Simulator")
SET(CPACK_PACKAGE_VENDOR "The Player Project")
-SET(CPACK_PACKAGE_DESCRIPTION_FILE
"${CMAKE_CURRENT_SOURCE_DIR}/DESCRIPTION.txt")
-SET(CPACK_RESOURCE_FILE_README "${CMAKE_CURRENT_SOURCE_DIR}/README.txt")
-SET(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_CURRENT_SOURCE_DIR}/COPYING.txt")
+#SET(CPACK_PACKAGE_DESCRIPTION_FILE
"${CMAKE_CURRENT_SOURCE_DIR}/DESCRIPTION.txt")
+#SET(CPACK_RESOURCE_FILE_README "${CMAKE_CURRENT_SOURCE_DIR}/README.txt")
+#SET(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_CURRENT_SOURCE_DIR}/COPYING.txt")
SET(CPACK_PACKAGE_VERSION_MAJOR "${V_MAJOR}")
SET(CPACK_PACKAGE_VERSION_MINOR "${V_MINOR}")
SET(CPACK_PACKAGE_VERSION_PATCH "${V_BUGFIX}")
+SET(CPACK_PACKAGE_INSTALL_DIRECTORY "${PROJECT_NAME}-${V_MAJOR}.${V_MINOR}")
INCLUDE(CPack)
Modified: code/stage/trunk/INSTALL
===================================================================
--- code/stage/trunk/INSTALL 2008-07-08 05:23:55 UTC (rev 6811)
+++ code/stage/trunk/INSTALL 2008-07-08 06:53:09 UTC (rev 6812)
@@ -48,13 +48,13 @@
substituting <prefix> with your chosen installation
directory.
- $ cmake -DCMAKE_INSTALL_PREFIX=<prefix>
+ $ cmake -DCMAKE_INSTALL_PREFIX=<prefix> .
For example to install in $HOME/playerstage, do:
- $ cmake -DCMAKE_INSTALL_PREFIX=$HOME/playerstage
+ $ cmake -DCMAKE_INSTALL_PREFIX=$HOME/playerstage .
-CMake will generate makefiles specifically for your machine. When this
+Cmake will generate makefiles specifically for your machine. When this
is done, you can inspect and edit the build settings using ccmake, or
by editing the file CMakeCache.txt.
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
-------------------------------------------------------------------------
Sponsored by: SourceForge.net Community Choice Awards: VOTE NOW!
Studies have shown that voting for your favorite open source project,
along with a healthy diet, reduces your potential for chronic lameness
and boredom. Vote Now at http://www.sourceforge.net/community/cca08
_______________________________________________
Playerstage-commit mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/playerstage-commit
