Revision: 8065
http://playerstage.svn.sourceforge.net/playerstage/?rev=8065&view=rev
Author: gbiggs
Date: 2009-07-21 09:10:52 +0000 (Tue, 21 Jul 2009)
Log Message:
-----------
Applied patch #2823554
Modified Paths:
--------------
code/player/trunk/client_libs/libplayerc/bindings/python/CMakeLists.txt
code/player/trunk/client_libs/libplayerc/bindings/ruby/CMakeLists.txt
code/player/trunk/client_libs/libplayerc++/CMakeLists.txt
Modified:
code/player/trunk/client_libs/libplayerc/bindings/python/CMakeLists.txt
===================================================================
--- code/player/trunk/client_libs/libplayerc/bindings/python/CMakeLists.txt
2009-07-21 07:46:10 UTC (rev 8064)
+++ code/player/trunk/client_libs/libplayerc/bindings/python/CMakeLists.txt
2009-07-21 09:10:52 UTC (rev 8065)
@@ -1,14 +1,14 @@
INCLUDE (FindPythonInterp)
IF (PYTHONINTERP_FOUND)
- OPTION (BUILD_PYTHON_BINDINGS "Build the Python bindings for the C client
library" ON)
+ OPTION (BUILD_PYTHONC_BINDINGS "Build the Python bindings for the C client
library" ON)
- IF (BUILD_PYTHON_BINDINGS)
+ IF (BUILD_PYTHONC_BINDINGS)
FIND_PACKAGE (SWIG)
IF (SWIG_FOUND)
MESSAGE (STATUS "Python bindings for C client library will be
built")
#INCLUDE (${SWIG_USE_FILE})
- INCLUDE
(${PLAYER_CMAKE_DIR}/internal/UseSwig_Player.cmake)
+ INCLUDE (${PLAYER_CMAKE_DIR}/internal/UseSwig_Player.cmake)
FIND_PACKAGE (PythonLibs)
INCLUDE_DIRECTORIES (${PYTHON_INCLUDE_PATH})
@@ -62,9 +62,9 @@
ELSE (SWIG_FOUND)
MESSAGE (STATUS "Python bindings for C client library will not be
built - could not find Swig")
ENDIF (SWIG_FOUND)
- ELSE (BUILD_PYTHON_BINDINGS)
+ ELSE (BUILD_PYTHONC_BINDINGS)
MESSAGE (STATUS "Python bindings for C client library will not be
built - disabled by user")
- ENDIF (BUILD_PYTHON_BINDINGS)
+ ENDIF (BUILD_PYTHONC_BINDINGS)
ELSE (PYTHONINTERP_FOUND)
MESSAGE (STATUS "Python bindings for C client library will not be built -
could not find Python")
ENDIF (PYTHONINTERP_FOUND)
Modified: code/player/trunk/client_libs/libplayerc/bindings/ruby/CMakeLists.txt
===================================================================
--- code/player/trunk/client_libs/libplayerc/bindings/ruby/CMakeLists.txt
2009-07-21 07:46:10 UTC (rev 8064)
+++ code/player/trunk/client_libs/libplayerc/bindings/ruby/CMakeLists.txt
2009-07-21 09:10:52 UTC (rev 8065)
@@ -1,12 +1,10 @@
FIND_PACKAGE (Ruby)
+IF (RUBY_LIBRARY AND RUBY_INCLUDE_PATH)
+ SET (RUBY_FOUND TRUE)
+ENDIF (RUBY_LIBRARY AND RUBY_INCLUDE_PATH)
-if(RUBY_LIBRARY AND RUBY_INCLUDE_PATH)
- SET(RUBY_FOUND TRUE)
-endif (RUBY_LIBRARY AND RUBY_INCLUDE_PATH)
-
-
- IF(RUBY_FOUND)
+IF(RUBY_FOUND)
OPTION (BUILD_RUBY_BINDINGS "Build the Ruby bindings for the C client
library" ON)
IF (BUILD_RUBY_BINDINGS)
@@ -15,7 +13,7 @@
MESSAGE (STATUS "Ruby bindings for C client library will be built")
#INCLUDE (${SWIG_USE_FILE})
- INCLUDE
(${PLAYER_CMAKE_DIR}/internal/UseSwig_Player.cmake)
+ INCLUDE (${PLAYER_CMAKE_DIR}/internal/UseSwig_Player.cmake)
INCLUDE_DIRECTORIES (${RUBY_INCLUDE_PATH})
INCLUDE_DIRECTORIES (${PROJECT_SOURCE_DIR})
@@ -52,7 +50,6 @@
TARGET_LINK_LIBRARIES (${SWIG_MODULE_playercr_REAL_NAME}
playerjpeg)
ENDIF (HAVE_JPEG)
-
#TODO: find ruby in windows, check install dir is correct
STRING(REPLACE "/usr/" "" ruby_relative_sitelib_dir
${RUBY_SITELIB_DIR})
STRING(REPLACE "local/" "" ruby_relative_sitelib_dir
${ruby_relative_sitelib_dir})
Modified: code/player/trunk/client_libs/libplayerc++/CMakeLists.txt
===================================================================
--- code/player/trunk/client_libs/libplayerc++/CMakeLists.txt 2009-07-21
07:46:10 UTC (rev 8064)
+++ code/player/trunk/client_libs/libplayerc++/CMakeLists.txt 2009-07-21
09:10:52 UTC (rev 8065)
@@ -1,4 +1,5 @@
ADD_SUBDIRECTORY (test)
+ADD_SUBDIRECTORY (bindings)
# Possibly use our own copy of XDR, and need gettimeofday replacement
IF (NOT HAVE_XDR OR NOT HAVE_GETTIMEOFDAY)
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Enter the BlackBerry Developer Challenge
This is your chance to win up to $100,000 in prizes! For a limited time,
vendors submitting new applications to BlackBerry App World(TM) will have
the opportunity to enter the BlackBerry Developer Challenge. See full prize
details at: http://p.sf.net/sfu/Challenge
_______________________________________________
Playerstage-commit mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/playerstage-commit
