Revision: 8485
http://playerstage.svn.sourceforge.net/playerstage/?rev=8485&view=rev
Author: thjc
Date: 2010-01-10 15:14:02 +0000 (Sun, 10 Jan 2010)
Log Message:
-----------
applied patch 2929113: Ruby Bindings install directory
Modified Paths:
--------------
code/player/trunk/client_libs/libplayerc/bindings/ruby/CMakeLists.txt
code/player/trunk/client_libs/libplayerc++/bindings/ruby/CMakeLists.txt
Modified: code/player/trunk/client_libs/libplayerc/bindings/ruby/CMakeLists.txt
===================================================================
--- code/player/trunk/client_libs/libplayerc/bindings/ruby/CMakeLists.txt
2010-01-10 15:09:50 UTC (rev 8484)
+++ code/player/trunk/client_libs/libplayerc/bindings/ruby/CMakeLists.txt
2010-01-10 15:14:02 UTC (rev 8485)
@@ -53,11 +53,11 @@
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 "/opt/" "" ruby_relative_sitelib_dir
${ruby_relative_sitelib_dir})
- STRING(REPLACE "local/" "" ruby_relative_sitelib_dir
${ruby_relative_sitelib_dir})
- STRING(REPLACE "lib/" ${PLAYER_LIBRARY_INSTALL_DIR}/
ruby_relative_sitelib_dir ${ruby_relative_sitelib_dir} )
- SET (RUBY_BINDINGS_INSTALL_DIR ${ruby_relative_sitelib_dir} CACHE
PATH "Ruby bindings installation directory under $RUBY_SITELIB_DIR")
+ STRING(REPLACE "/usr/" "" ruby_relative_sitearch_dir
${RUBY_SITEARCH_DIR})
+ STRING(REPLACE "/opt/" "" ruby_relative_sitearch_dir
${ruby_relative_sitearch_dir})
+ STRING(REPLACE "local/" "" ruby_relative_sitearch_dir
${ruby_relative_sitearch_dir})
+ STRING(REPLACE "lib/" ${PLAYER_LIBRARY_INSTALL_DIR}/
ruby_relative_sitearch_dir ${ruby_relative_sitearch_dir} )
+ SET (RUBY_BINDINGS_INSTALL_DIR ${ruby_relative_sitearch_dir} CACHE
PATH "Ruby bindings installation directory under $RUBY_sitearch_DIR")
MARK_AS_ADVANCED (RUBY_BINDINGS_INSTALL_DIR)
INSTALL (FILES ${CMAKE_CURRENT_BINARY_DIR}/playercr.so
Modified:
code/player/trunk/client_libs/libplayerc++/bindings/ruby/CMakeLists.txt
===================================================================
--- code/player/trunk/client_libs/libplayerc++/bindings/ruby/CMakeLists.txt
2010-01-10 15:09:50 UTC (rev 8484)
+++ code/player/trunk/client_libs/libplayerc++/bindings/ruby/CMakeLists.txt
2010-01-10 15:14:02 UTC (rev 8485)
@@ -31,11 +31,11 @@
SWIG_LINK_LIBRARIES (playercppr ${RUBY_LIBRARY} playerc++)
# TODO: find ruby in windows, check install dir is correct
- STRING(REPLACE "/usr/" "" ruby_relative_sitelib_dir
${RUBY_SITELIB_DIR})
- STRING(REPLACE "/opt/" "" ruby_relative_sitelib_dir
${ruby_relative_sitelib_dir})
- STRING(REPLACE "local/" "" ruby_relative_sitelib_dir
${ruby_relative_sitelib_dir})
- STRING(REPLACE "lib/" ${PLAYER_LIBRARY_INSTALL_DIR}/
ruby_relative_sitelib_dir ${ruby_relative_sitelib_dir})
- SET (RUBY_BINDINGS_INSTALL_DIR ${ruby_relative_sitelib_dir}
CACHE PATH "Ruby bindings for the c++ library installation directory under
$RUBY_SITELIB_DIR")
+ STRING(REPLACE "/usr/" "" ruby_relative_sitearch_dir
${RUBY_SITEARCH_DIR})
+ STRING(REPLACE "/opt/" "" ruby_relative_sitearch_dir
${ruby_relative_sitearch_dir})
+ STRING(REPLACE "local/" "" ruby_relative_sitearch_dir
${ruby_relative_sitearch_dir})
+ STRING(REPLACE "lib/" ${PLAYER_LIBRARY_INSTALL_DIR}/
ruby_relative_sitearch_dir ${ruby_relative_sitearch_dir})
+ SET (RUBY_BINDINGS_INSTALL_DIR ${ruby_relative_sitearch_dir}
CACHE PATH "Ruby bindings for the c++ library installation directory under
$RUBY_SITEARCH_DIR")
MARK_AS_ADVANCED (RUBY_BINDINGS_INSTALL_DIR)
INSTALL (FILES ${CMAKE_CURRENT_BINARY_DIR}/playercppr.so
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 Verizon Developer Community
Take advantage of Verizon's best-in-class app development support
A streamlined, 14 day to market process makes app distribution fast and easy
Join now and get one step closer to millions of Verizon customers
http://p.sf.net/sfu/verizon-dev2dev
_______________________________________________
Playerstage-commit mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/playerstage-commit
