Revision: 6932
http://playerstage.svn.sourceforge.net/playerstage/?rev=6932&view=rev
Author: jeremy_asher
Date: 2008-07-29 18:57:10 +0000 (Tue, 29 Jul 2008)
Log Message:
-----------
stage: getting ready for 3.0.1
Modified Paths:
--------------
code/stage/trunk/CMakeLists.txt
code/stage/trunk/docsrc/stage.dox
code/stage/trunk/libstage/CMakeLists.txt
code/stage/trunk/libstage/worldgui.cc
code/stage/trunk/libstageplugin/test/CMakeLists.txt
Modified: code/stage/trunk/CMakeLists.txt
===================================================================
--- code/stage/trunk/CMakeLists.txt 2008-07-28 23:29:25 UTC (rev 6931)
+++ code/stage/trunk/CMakeLists.txt 2008-07-29 18:57:10 UTC (rev 6932)
@@ -2,7 +2,7 @@
SET( V_MAJOR 3 )
SET( V_MINOR 0 )
-SET( V_BUGFIX 0 )
+SET( V_BUGFIX 1 )
SET( VERSION ${V_MAJOR}.${V_MINOR}.${V_BUGFIX} )
SET( APIVERSION ${V_MAJOR}.${V_MINOR} )
Modified: code/stage/trunk/docsrc/stage.dox
===================================================================
--- code/stage/trunk/docsrc/stage.dox 2008-07-28 23:29:25 UTC (rev 6931)
+++ code/stage/trunk/docsrc/stage.dox 2008-07-29 18:57:10 UTC (rev 6932)
@@ -23,7 +23,7 @@
# This could be handy for archiving the generated documentation or
# if some version control system is used.
-PROJECT_NUMBER = 3.0.0
+PROJECT_NUMBER = 3.0.1
# The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute)
# base path where the generated documentation will be put.
Modified: code/stage/trunk/libstage/CMakeLists.txt
===================================================================
--- code/stage/trunk/libstage/CMakeLists.txt 2008-07-28 23:29:25 UTC (rev
6931)
+++ code/stage/trunk/libstage/CMakeLists.txt 2008-07-29 18:57:10 UTC (rev
6932)
@@ -1,3 +1,4 @@
+message( STATUS "Checking for libtool" )
find_path( LTDL_INCLUDE_DIR ltdl.h DOC "Libtool include dir" )
find_library( LTDL_LIB ltdl DOC "Libtool lib" )
@@ -2,3 +3,5 @@
IF (${LTDL_LIB} STREQUAL "LTDL_LIB-NOTFOUND")
- message( FATAL_ERROR "Libtool library not found, aborting" )
+ message( FATAL_ERROR "libtool library not found, aborting" )
+ELSE (${LTDL_LIB} STREQUAL "LTDL_LIB-NOTFOUND")
+ message( STATUS " found" )
ENDIF (${LTDL_LIB} STREQUAL "LTDL_LIB-NOTFOUND")
Modified: code/stage/trunk/libstage/worldgui.cc
===================================================================
--- code/stage/trunk/libstage/worldgui.cc 2008-07-28 23:29:25 UTC (rev
6931)
+++ code/stage/trunk/libstage/worldgui.cc 2008-07-29 18:57:10 UTC (rev
6932)
@@ -326,7 +326,7 @@
std::string StgWorldGui::ClockString()
{
- const uint32_t usec_per_hour = 3600000000;
+ const uint32_t usec_per_hour = 3600000000U;
const uint32_t usec_per_minute = 60000000;
const uint32_t usec_per_second = 1000000;
const uint32_t usec_per_msec = 1000;
Modified: code/stage/trunk/libstageplugin/test/CMakeLists.txt
===================================================================
--- code/stage/trunk/libstageplugin/test/CMakeLists.txt 2008-07-28 23:29:25 UTC
(rev 6931)
+++ code/stage/trunk/libstageplugin/test/CMakeLists.txt 2008-07-29 18:57:10 UTC
(rev 6932)
@@ -1,24 +1,18 @@
message( STATUS "Building Player plugin tests" )
pkg_search_module( CPPUNIT REQUIRED cppunit )
+pkg_search_module( PLAYERC REQUIRED playerc )
-find_path( PLAYERC_INCLUDE_DIR libplayerc/playerc.h DOC "libplayerc include
dir" )
-find_library( PLAYERC_LIB playerc DOC "libplayerc lib" )
-
-IF (${PLAYERC_LIB} STREQUAL "PLAYERC_LIB-NOTFOUND")
- message( FATAL_ERROR "libplayerc library not found, aborting" )
-ENDIF (${PLAYERC_LIB} STREQUAL "PLAYERC_LIB-NOTFOUND")
-
include_directories(
${CPPUNIT_INCLUDE_DIRS}
- ${PLAYERC_INCLUDE_DIR}
+ ${PLAYERC_INCLUDE_DIRS}
)
link_directories(
${CPPUNIT_LIBRARY_DIRS}
+ ${PLAYERC_LIBRARY_DIRS}
)
-
set( lspTestSrcs
lsp_test.cc
lsp_test_proxy.cc
@@ -42,7 +36,7 @@
add_executable( lsp_test ${lspTestSrcs} )
target_link_libraries( lsp_test
- ${PLAYERC_LIB}
+ ${PLAYERC_LIBRARIES}
${CPPUNIT_LIBRARIES}
dl
)
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
-------------------------------------------------------------------------
This SF.Net email is sponsored by the Moblin Your Move Developer's challenge
Build the coolest Linux based applications with Moblin SDK & win great prizes
Grand prize is a trip for two to an Open Source event anywhere in the world
http://moblin-contest.org/redirect.php?banner_id=100&url=/
_______________________________________________
Playerstage-commit mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/playerstage-commit
