mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-04-20 05:12:07 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge topic 'feature/findruby-3x'

Browse Source 
6b6bc7791d FindRuby: evict non-matching binaries and keep scanning.
42d99a248e FindRuby: add support for versions up to 3.1.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !6925
This commit is contained in:
Brad King
2022-02-01 15:31:34 +00:00
committed by Kitware Robot
parent e7e5ebd0e3 6b6bc7791d
commit 9d439dfd1b
1 changed files with 28 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
Modules/FindRuby.cmake
View File

@@ -8,7 +8,7 @@ FindRuby
Find Ruby
This module finds if Ruby is installed and determines where the
include files and libraries are. Ruby 1.8 through 2.7 are
include files and libraries are. Ruby 1.8 through 3.1 are
supported.
The minimum required version of Ruby can be specified using the
@@ -139,13 +139,13 @@ set(Ruby_FIND_VERSION_SHORT_NODOT "${Ruby_FIND_VERSION_MAJOR}${Ruby_FIND_VERSION
# Set name of possible executables, ignoring the minor
# Eg:
# 2.1.1 => from ruby27 to ruby21 included
# 2.1 => from ruby27 to ruby21 included
# 2 => from ruby26 to ruby20 included
# empty => from ruby27 to ruby18 included
# 2.1.1 => from ruby31 to ruby21 included
# 2.1 => from ruby31 to ruby21 included
# 2 => from ruby31 to ruby20 included
# empty => from ruby31 to ruby18 included
if(NOT Ruby_FIND_VERSION_EXACT)
foreach(_ruby_version RANGE 27 18 -1)
foreach(_ruby_version RANGE 31 18 -1)
string(SUBSTRING "${_ruby_version}" 0 1 _ruby_major_version)
string(SUBSTRING "${_ruby_version}" 1 1 _ruby_minor_version)
@@ -266,9 +266,20 @@ while(1)
_RUBY_VALIDATE_INTERPRETER (${Ruby_FIND_VERSION})
if (Ruby_EXECUTABLE)
break()
else()
# Remove first entry from names list.
LIST(REMOVE_AT _Ruby_POSSIBLE_EXECUTABLE_NAMES 0)
# If the list is now empty, abort.
if (NOT _Ruby_POSSIBLE_EXECUTABLE_NAMES)
break()
else()
# Otherwise, continue with the remaining list. Make sure that we clear
# the cached variable.
unset(Ruby_EXECUTABLE CACHE)
endif()
endif()
break()
endwhile()
if(Ruby_EXECUTABLE AND NOT Ruby_VERSION_MAJOR)
@@ -398,6 +409,16 @@ if(Ruby_EXECUTABLE AND NOT Ruby_VERSION_MAJOR)
set(Ruby_VERSION_MAJOR 2)
set(Ruby_VERSION_MINOR 7)
endif()
# check whether we found 3.0.x
if(${Ruby_EXECUTABLE} MATCHES "ruby3\\.?0")
set(Ruby_VERSION_MAJOR 3)
set(Ruby_VERSION_MINOR 0)
endif()
# check whether we found 3.1.x
if(${Ruby_EXECUTABLE} MATCHES "ruby3\\.?1")
set(Ruby_VERSION_MAJOR 3)
set(Ruby_VERSION_MINOR 1)
endif()
endif()
if(Ruby_VERSION_MAJOR)