diff options
| author | Sebastian Sauer <mail@dipe.org> | 2006-10-24 01:02:17 +0000 |
|---|---|---|
| committer | Sebastian Sauer <mail@dipe.org> | 2006-10-24 01:02:17 +0000 |
| commit | 8c826b4040dbb87ff8c1a9394d8e3cbfdbc03d56 (patch) | |
| tree | 0edad03d1f1d3324495b3f162c72b6f293f51917 | |
| parent | 1c388b04ce49019c0acab1fc203a6a615f5bd15c (diff) | |
| download | extra-cmake-modules-8c826b4040dbb87ff8c1a9394d8e3cbfdbc03d56.tar.gz extra-cmake-modules-8c826b4040dbb87ff8c1a9394d8e3cbfdbc03d56.tar.bz2 | |
* check also for ruby 1.9
* 'archdir' may empty and if that's the case use 'rubyincludedir'
* use 'ruby_version'
* don't hardcode ruby include-path
svn path=/trunk/KDE/kdelibs/; revision=598580
| -rw-r--r-- | modules/FindRUBY.cmake | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/modules/FindRUBY.cmake b/modules/FindRUBY.cmake index af720772..93f792d4 100644 --- a/modules/FindRUBY.cmake +++ b/modules/FindRUBY.cmake @@ -23,32 +23,33 @@ endif (RUBY_LIBRARY AND RUBY_INCLUDE_PATH) # RUBY_LIBDIR=`$RUBY -r rbconfig -e 'printf("%s",Config::CONFIG@<:@"libdir"@:>@)'` # RUBY_LIBRUBYARG=`$RUBY -r rbconfig -e 'printf("%s",Config::CONFIG@<:@"LIBRUBYARG_SHARED"@:>@)'` -FIND_PROGRAM(RUBY_EXECUTABLE NAMES ruby ruby1.8 ruby18 ) +FIND_PROGRAM(RUBY_EXECUTABLE NAMES ruby ruby1.8 ruby18 ruby1.9 ruby19) -EXECUTE_PROCESS(COMMAND ${RUBY_EXECUTABLE} -r rbconfig -e "puts Config::CONFIG['archdir']" +EXECUTE_PROCESS(COMMAND ${RUBY_EXECUTABLE} -r rbconfig -e "puts Config::CONFIG['archdir'] || Config::CONFIG['rubyincludedir']" OUTPUT_VARIABLE RUBY_ARCH_DIR) - EXECUTE_PROCESS(COMMAND ${RUBY_EXECUTABLE} -r rbconfig -e "puts Config::CONFIG['libdir']" OUTPUT_VARIABLE RUBY_POSSIBLE_LIB_PATH) EXECUTE_PROCESS(COMMAND ${RUBY_EXECUTABLE} -r rbconfig -e "puts Config::CONFIG['rubylibdir']" OUTPUT_VARIABLE RUBY_RUBY_LIB_PATH) +EXECUTE_PROCESS(COMMAND ${RUBY_EXECUTABLE} -r rbconfig -e "puts Config::CONFIG['ruby_version']" + OUTPUT_VARIABLE RUBY_VERSION) + # remove the new lines from the output by replacing them with empty strings STRING(REPLACE "\n" "" RUBY_ARCH_DIR "${RUBY_ARCH_DIR}") STRING(REPLACE "\n" "" RUBY_POSSIBLE_LIB_PATH "${RUBY_POSSIBLE_LIB_PATH}") STRING(REPLACE "\n" "" RUBY_RUBY_LIB_PATH "${RUBY_RUBY_LIB_PATH}") - +STRING(REPLACE "\n" "" RUBY_VERSION "${RUBY_VERSION}") FIND_PATH(RUBY_INCLUDE_PATH - NAMES ruby.h - PATHS - ${RUBY_ARCH_DIR} - /usr/lib/ruby/1.8/i586-linux-gnu/ ) + NAMES ruby.h + PATHS ${RUBY_ARCH_DIR} ${RUBY_RUBY_LIB_PATH} + ) FIND_LIBRARY(RUBY_LIBRARY - NAMES ruby + NAMES ruby${RUBY_VERSION} ruby PATHS ${RUBY_POSSIBLE_LIB_PATH} ) |