Revision: 8136
          http://playerstage.svn.sourceforge.net/playerstage/?rev=8136&view=rev
Author:   gerkey
Date:     2009-07-26 20:48:48 +0000 (Sun, 26 Jul 2009)

Log Message:
-----------
Added a further hack to computing the ruby install directory, to make it work 
on OS X, when ruby is installed from MacPorts, in /opt/local.  There must be a 
better way to do this.

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       
2009-07-25 08:19:31 UTC (rev 8135)
+++ code/player/trunk/client_libs/libplayerc/bindings/ruby/CMakeLists.txt       
2009-07-26 20:48:48 UTC (rev 8136)
@@ -52,6 +52,7 @@
 
             #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})
             SET (RUBY_BINDINGS_INSTALL_DIR ${ruby_relative_sitelib_dir} CACHE 
PATH "Ruby bindings installation directory under $RUBY_SITELIB_DIR")
             MARK_AS_ADVANCED (RUBY_BINDINGS_INSTALL_DIR)

Modified: 
code/player/trunk/client_libs/libplayerc++/bindings/ruby/CMakeLists.txt
===================================================================
--- code/player/trunk/client_libs/libplayerc++/bindings/ruby/CMakeLists.txt     
2009-07-25 08:19:31 UTC (rev 8135)
+++ code/player/trunk/client_libs/libplayerc++/bindings/ruby/CMakeLists.txt     
2009-07-26 20:48:48 UTC (rev 8136)
@@ -34,8 +34,10 @@
 
              #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})
             SET (RUBY_BINDINGS_INSTALL_DIR ${ruby_relative_sitelib_dir} CACHE 
PATH "Ruby bindings for the c++ library installation directory under 
$RUBY_SITELIB_DIR")
+            message("RUBY_BINDINGS_INSTALL_DIR: ${RUBY_BINDINGS_INSTALL_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.

------------------------------------------------------------------------------
_______________________________________________
Playerstage-commit mailing list
Playerstage-commit@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/playerstage-commit

Reply via email to