stage: getting ready for 3.0.1

rtv · Jul 29, 2008 · ff6b5cc · ff6b5cc
1 parent 43fa443
commit ff6b5cc
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 14 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -2,7 +2,7 @@ PROJECT(Stage)
 
 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} )

diff --git a/docsrc/stage.dox b/docsrc/stage.dox
@@ -23,7 +23,7 @@ PROJECT_NAME           = Stage
 # 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. 

diff --git a/libstage/CMakeLists.txt b/libstage/CMakeLists.txt
@@ -1,8 +1,11 @@
+message( STATUS "Checking for libtool" )
 find_path( LTDL_INCLUDE_DIR ltdl.h DOC "Libtool include dir" )
 find_library( LTDL_LIB ltdl DOC "Libtool lib" )
 
 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")
 
 include_directories( 

diff --git a/libstage/worldgui.cc b/libstage/worldgui.cc
@@ -326,7 +326,7 @@ bool StgWorldGui::Update()
 
 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;

diff --git a/libstageplugin/test/CMakeLists.txt b/libstageplugin/test/CMakeLists.txt
@@ -1,24 +1,18 @@
 message( STATUS "Building Player plugin tests" )
 
 pkg_search_module( CPPUNIT REQUIRED cppunit )
-
-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")
+pkg_search_module( PLAYERC REQUIRED playerc )
 
 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 @@ set( lspTestSrcs
 add_executable( lsp_test ${lspTestSrcs} )
 
 target_link_libraries( lsp_test
-	${PLAYERC_LIB}
+	${PLAYERC_LIBRARIES}
 	${CPPUNIT_LIBRARIES}
 	dl
 )