diff options
| author | Alexander Neundorf <neundorf@kde.org> | 2006-09-13 21:27:51 +0000 |
|---|---|---|
| committer | Alexander Neundorf <neundorf@kde.org> | 2006-09-13 21:27:51 +0000 |
| commit | 45ed760862b295694ff9ef111513be68f4a4b535 (patch) | |
| tree | 72e744beef3645ffd5b28414ce657786bb79532a | |
| parent | 1f010485d5e0ca81774c401c66af2612c47e6193 (diff) | |
| download | extra-cmake-modules-45ed760862b295694ff9ef111513be68f4a4b535.tar.gz extra-cmake-modules-45ed760862b295694ff9ef111513be68f4a4b535.tar.bz2 | |
-apply a patch from flameeyes at gentoo dot org , which asks ruby for the location of its lib and headers
Alex
CCMAIL: montel@kde.org
Laurent: where is this actually used ?
svn path=/trunk/KDE/kdelibs/; revision=583963
| -rw-r--r-- | modules/FindRUBY.cmake | 39 |
1 files changed, 20 insertions, 19 deletions
diff --git a/modules/FindRUBY.cmake b/modules/FindRUBY.cmake index 4510660b..6ac3c291 100644 --- a/modules/FindRUBY.cmake +++ b/modules/FindRUBY.cmake @@ -13,36 +13,37 @@ if(RUBY_LIBRARY AND RUBY_INCLUDE_PATH) - # Already in cache, be silent - set(RUBY_FIND_QUIETLY TRUE) + # Already in cache, be silent + set(RUBY_FIND_QUIETLY TRUE) endif (RUBY_LIBRARY AND RUBY_INCLUDE_PATH) -SET(RUBY_POSSIBLE_INCLUDE_PATHS - /usr/lib/ruby/1.8/i586-linux-gnu/ - ) +# RUBY_ARCHDIR=`$RUBY -r rbconfig -e 'printf("%s",Config::CONFIG@<:@"archdir"@:>@)'` +# RUBY_SITEARCHDIR=`$RUBY -r rbconfig -e 'printf("%s",Config::CONFIG@<:@"sitearchdir"@:>@)'` +# RUBY_SITEDIR=`$RUBY -r rbconfig -e 'printf("%s",Config::CONFIG@<:@"sitelibdir"@:>@)'` +# RUBY_LIBDIR=`$RUBY -r rbconfig -e 'printf("%s",Config::CONFIG@<:@"libdir"@:>@)'` +# RUBY_LIBRUBYARG=`$RUBY -r rbconfig -e 'printf("%s",Config::CONFIG@<:@"LIBRUBYARG_SHARED"@:>@)'` -SET(RUBY_POSSIBLE_LIB_PATHS - /usr/lib - ) +FIND_PROGRAM(RUBY_EXECUTABLE NAMES ruby ruby1.8 ruby18 ) + +EXEC_PROGRAM(${RUBY_EXECUTABLE} ARGS -r rbconfig -e 'puts Config::CONFIG[\"archdir\"]' + OUTPUT_VARIABLE RUBY_ARCH_DIR) + +EXEC_PROGRAM(${RUBY_EXECUTABLE} ARGS -r rbconfig -e 'puts Config::CONFIG["libdir"]' + OUTPUT_VARIABLE RUBY_POSSIBLE_LIB_PATH) -FIND_PATH(RUBY_INCLUDE_PATH ruby.h - ${RUBY_POSSIBLE_INCLUDE_PATHS}) +FIND_PATH(RUBY_INCLUDE_PATH + NAMES ruby.h + PATHS + ${RUBY_ARCH_DIR} + /usr/lib/ruby/1.8/i586-linux-gnu/ ) FIND_LIBRARY(RUBY_LIBRARY NAMES ruby - PATHS ${RUBY_POSSIBLE_LIB_PATHS} + PATHS ${RUBY_POSSIBLE_LIB_PATH} ) -FIND_PROGRAM(RUBY_EXECUTABLE - NAMES ruby - PATHS - /usr/bin - /usr/local/bin -) - MARK_AS_ADVANCED( RUBY_EXECUTABLE RUBY_LIBRARY RUBY_INCLUDE_PATH ) - |