|
 |
fa331df |
From 86f06c1e30b2fddeac6be8f8508ac225ebd0d4e1 Mon Sep 17 00:00:00 2001
|
|
|
fa331df |
From: =?UTF-8?q?Klaus=20K=C3=A4mpf?= <kkaempf@suse.de>
|
|
|
fa331df |
Date: Fri, 24 Nov 2017 16:39:22 +0100
|
|
|
fa331df |
Subject: [PATCH 06/20] Find Ruby 2.5
|
|
|
fa331df |
|
|
|
fa331df |
---
|
|
|
fa331df |
cmake/modules/FindRuby.cmake | 4 ++--
|
|
|
fa331df |
1 file changed, 2 insertions(+), 2 deletions(-)
|
|
|
fa331df |
|
|
|
fa331df |
diff --git a/cmake/modules/FindRuby.cmake b/cmake/modules/FindRuby.cmake
|
|
|
fa331df |
index 1671f029..bc6d48d4 100644
|
|
|
fa331df |
--- a/cmake/modules/FindRuby.cmake
|
|
|
fa331df |
+++ b/cmake/modules/FindRuby.cmake
|
|
|
fa331df |
@@ -21,7 +21,7 @@ endif (RUBY_LIBRARY AND RUBY_INCLUDE_PATH)
|
|
|
fa331df |
# RUBY_LIBDIR=`$RUBY -r rbconfig -e 'printf("%s",RbConfig::CONFIG@<:@"libdir"@:>@)'`
|
|
|
fa331df |
# RUBY_LIBRUBYARG=`$RUBY -r rbconfig -e 'printf("%s",RbConfig::CONFIG@<:@"LIBRUBYARG_SHARED"@:>@)'`
|
|
|
fa331df |
|
|
|
fa331df |
-FIND_PROGRAM(RUBY_EXECUTABLE NAMES ruby ruby22 ruby21 ruby20 ruby19 ruby1.8 ruby18 )
|
|
|
fa331df |
+FIND_PROGRAM(RUBY_EXECUTABLE NAMES ruby.ruby2.5 ruby.ruby2.4 ruby.ruby2.3 ruby.ruby2.2 ruby ruby22 ruby21 ruby20 ruby19 ruby1.8 ruby18 )
|
|
|
fa331df |
|
|
|
fa331df |
EXECUTE_PROCESS(COMMAND ${RUBY_EXECUTABLE} -r rbconfig -e "print RbConfig::CONFIG['MAJOR']"
|
|
|
fa331df |
OUTPUT_VARIABLE RUBY_VERSION_MAJOR)
|
|
|
fa331df |
@@ -91,7 +91,7 @@ FIND_PATH(RUBY_INCLUDE_PATH
|
|
|
fa331df |
/usr/lib/ruby/1.8/i586-linux-gnu/ )
|
|
|
fa331df |
|
|
|
fa331df |
FIND_LIBRARY(RUBY_LIBRARY
|
|
|
fa331df |
- NAMES ruby ruby1.9 ruby1.8
|
|
|
fa331df |
+ NAMES ruby2.5 ruby2.4 ruby2.3 ruby2.2 ruby2.1 ruby ruby1.9 ruby1.8
|
|
|
fa331df |
PATHS
|
|
|
fa331df |
${RUBY_POSSIBLE_LIB_PATH}
|
|
|
fa331df |
${RUBY_RUBY_LIB_PATH}
|
|
|
fa331df |
--
|
|
|
fa331df |
2.15.1
|
|
|
fa331df |
|