From 4b4b7758ca3bac85fcbe8722cbd028fd78b26cca Mon Sep 17 00:00:00 2001 From: Alexander Neundorf Date: Fri, 15 Sep 2006 22:01:43 +0000 Subject: -use EXECUTE_PROCESS() instead of EXEC_PROGRAM() -also check for rubylibdir Alex CCMAIL: ewilligh@uni-koeln.de svn path=/trunk/KDE/kdelibs/; revision=584954 --- modules/FindRUBY.cmake | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) (limited to 'modules') diff --git a/modules/FindRUBY.cmake b/modules/FindRUBY.cmake index 6ac3c291..af720772 100644 --- a/modules/FindRUBY.cmake +++ b/modules/FindRUBY.cmake @@ -25,12 +25,22 @@ endif (RUBY_LIBRARY AND RUBY_INCLUDE_PATH) FIND_PROGRAM(RUBY_EXECUTABLE NAMES ruby ruby1.8 ruby18 ) -EXEC_PROGRAM(${RUBY_EXECUTABLE} ARGS -r rbconfig -e 'puts Config::CONFIG[\"archdir\"]' +EXECUTE_PROCESS(COMMAND ${RUBY_EXECUTABLE} -r rbconfig -e "puts Config::CONFIG['archdir']" OUTPUT_VARIABLE RUBY_ARCH_DIR) -EXEC_PROGRAM(${RUBY_EXECUTABLE} ARGS -r rbconfig -e 'puts Config::CONFIG["libdir"]' + +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) + +# 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}") + + FIND_PATH(RUBY_INCLUDE_PATH NAMES ruby.h PATHS -- cgit v1.2.1