diff options
| author | Alexander Neundorf <neundorf@kde.org> | 2006-09-15 22:01:43 +0000 |
|---|---|---|
| committer | Alexander Neundorf <neundorf@kde.org> | 2006-09-15 22:01:43 +0000 |
| commit | 4b4b7758ca3bac85fcbe8722cbd028fd78b26cca (patch) | |
| tree | 08af3301d9815eb4af807b5b6292de591bea9338 | |
| parent | 79e98ba6c22e9e1dd051c4c9238363d98a73c6f6 (diff) | |
| download | extra-cmake-modules-4b4b7758ca3bac85fcbe8722cbd028fd78b26cca.tar.gz extra-cmake-modules-4b4b7758ca3bac85fcbe8722cbd028fd78b26cca.tar.bz2 | |
-use EXECUTE_PROCESS() instead of EXEC_PROGRAM()
-also check for rubylibdir
Alex
CCMAIL: ewilligh@uni-koeln.de
svn path=/trunk/KDE/kdelibs/; revision=584954
| -rw-r--r-- | modules/FindRUBY.cmake | 14 |
1 files changed, 12 insertions, 2 deletions
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 |