summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2023-10-11 13:28:49 (GMT)
committerKitware Robot <kwrobot@kitware.com>2023-10-11 13:29:10 (GMT)
commit346c1e5d5768b2fffa0b8b685078fbf921c6a13c (patch)
treefe4064f61c44e433e76408d370ca30919494d642
parent308d687018a8f63936a3d850ef487e9194e08f31 (diff)
parent77ed529c22e747ac2287aeb961e6fe2790c42f6d (diff)
downloadCMake-346c1e5d5768b2fffa0b8b685078fbf921c6a13c.zip
CMake-346c1e5d5768b2fffa0b8b685078fbf921c6a13c.tar.gz
CMake-346c1e5d5768b2fffa0b8b685078fbf921c6a13c.tar.bz2
Merge topic 'findruby-add-support-for-3.2' into release-3.28
77ed529c22 FindRuby: Add support for 3.2 Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !8864
-rw-r--r--Modules/FindRuby.cmake12
1 files changed, 6 insertions, 6 deletions
diff --git a/Modules/FindRuby.cmake b/Modules/FindRuby.cmake
index d82f41d..4fe8bd5 100644
--- a/Modules/FindRuby.cmake
+++ b/Modules/FindRuby.cmake
@@ -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 3.1 are
+include files and libraries are. Ruby 1.8 through 3.2 are
supported.
The minimum required version of Ruby can be specified using the
@@ -136,13 +136,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 ruby31 to ruby21 included
-# 2.1 => from ruby31 to ruby21 included
-# 2 => from ruby31 to ruby20 included
-# empty => from ruby31 to ruby18 included
+# 2.1.1 => from ruby32 to ruby21 included
+# 2.1 => from ruby32 to ruby21 included
+# 2 => from ruby32 to ruby20 included
+# empty => from ruby32 to ruby18 included
if(NOT Ruby_FIND_VERSION_EXACT)
- foreach(_ruby_version RANGE 31 18 -1)
+ foreach(_ruby_version RANGE 32 18 -1)
string(SUBSTRING "${_ruby_version}" 0 1 _ruby_major_version)
string(SUBSTRING "${_ruby_version}" 1 1 _ruby_minor_version)