Revision: 6523
http://playerstage.svn.sourceforge.net/playerstage/?rev=6523&view=rev
Author: jeremy_asher
Date: 2008-06-10 11:11:59 -0700 (Tue, 10 Jun 2008)
Log Message:
-----------
Updated Player version checking
Modified Paths:
--------------
code/stage/trunk/CMakeLists.txt
Modified: code/stage/trunk/CMakeLists.txt
===================================================================
--- code/stage/trunk/CMakeLists.txt 2008-06-10 17:57:01 UTC (rev 6522)
+++ code/stage/trunk/CMakeLists.txt 2008-06-10 18:11:59 UTC (rev 6523)
@@ -20,8 +20,10 @@
-DVERSION=\"${VERSION}\" )
include(FindPkgConfig)
-pkg_check_modules( GLIB glib-2.0 )
-pkg_check_modules( PLAYER playercore )
+#variable_watch(PLAYER_FOUND)
+#variable_watch(PLAYER_VERSION)
+pkg_search_module( GLIB glib-2.0 )
+pkg_search_module( PLAYER playercore>=2.1 )
find_package(OPENGL REQUIRED)
# include(FindFLTK) doesn't seem to work for me, so we work a bit harder
@@ -52,10 +54,15 @@
ADD_SUBDIRECTORY(libstage)
ADD_SUBDIRECTORY(examples)
-#IF( PLAYER_FOUND )
-#MESSAGE( "Found Player in ${PLAYER_INCLUDE_DIRS}")
-#ADD_SUBDIRECTORY(libstageplugin)
-#ENDIF( PLAYER_FOUND )
+string( REGEX MATCH "([0-9]*)\\.([0-9]*)\\." player_ver ${PLAYER_VERSION} )
+SET(min_player_major 2)
+SET(min_player_minor 1)
+IF( NOT CMAKE_MATCH_1 LESS min_player_major )
+ IF( NOT CMAKE_MATCH_2 LESS min_player_minor )
+ MESSAGE( "Found Player v${PLAYER_VERSION} in
${PLAYER_INCLUDE_DIRS}")
+ ADD_SUBDIRECTORY(libstageplugin)
+ ENDIF()
+ENDIF()
INSTALL(FILES rgb.txt stagelogo.png
DESTINATION share/stage
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
-------------------------------------------------------------------------
Check out the new SourceForge.net Marketplace.
It's the best place to buy or sell services for
just about anything Open Source.
http://sourceforge.net/services/buy/index.php
_______________________________________________
Playerstage-commit mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/playerstage-commit
