FindRuby: Add support for versions 2.2, 2.3, and 2.4

Author: J. Peter Mugaas (jpmugaas on gitlab.kitware.com)
Fixes: #17475
This commit is contained in:
Brad King committed 2017-11-16 07:05:00 -05:00
1 parent 23ab451a13
commit cd2cdfe253
1 file changed
+18
+18
View File
@@ -59,6 +59,9 @@ else()
endif() endif()
if(NOT Ruby_FIND_VERSION_EXACT) if(NOT Ruby_FIND_VERSION_EXACT)
list(APPEND _RUBY_POSSIBLE_EXECUTABLE_NAMES ruby2.4 ruby24)
list(APPEND _RUBY_POSSIBLE_EXECUTABLE_NAMES ruby2.3 ruby23)
list(APPEND _RUBY_POSSIBLE_EXECUTABLE_NAMES ruby2.2 ruby22)
list(APPEND _RUBY_POSSIBLE_EXECUTABLE_NAMES ruby2.1 ruby21) list(APPEND _RUBY_POSSIBLE_EXECUTABLE_NAMES ruby2.1 ruby21)
list(APPEND _RUBY_POSSIBLE_EXECUTABLE_NAMES ruby2.0 ruby20) list(APPEND _RUBY_POSSIBLE_EXECUTABLE_NAMES ruby2.0 ruby20)
list(APPEND _RUBY_POSSIBLE_EXECUTABLE_NAMES ruby1.9 ruby19) list(APPEND _RUBY_POSSIBLE_EXECUTABLE_NAMES ruby1.9 ruby19)
@@ -170,6 +173,21 @@ if(RUBY_EXECUTABLE AND NOT RUBY_VERSION_MAJOR)
set(RUBY_VERSION_MAJOR 2) set(RUBY_VERSION_MAJOR 2)
set(RUBY_VERSION_MINOR 1) set(RUBY_VERSION_MINOR 1)
endif() endif()
# check whether we found 2.2.x
if(${RUBY_EXECUTABLE} MATCHES "ruby2\\.?2")
set(RUBY_VERSION_MAJOR 2)
set(RUBY_VERSION_MINOR 2)
endif()
# check whether we found 2.3.x
if(${RUBY_EXECUTABLE} MATCHES "ruby2\\.?3")
set(RUBY_VERSION_MAJOR 2)
set(RUBY_VERSION_MINOR 3)
endif()
# check whether we found 2.4.x
if(${RUBY_EXECUTABLE} MATCHES "ruby2\\.?4")
set(RUBY_VERSION_MAJOR 2)
set(RUBY_VERSION_MINOR 4)
endif()
endif() endif()
if(RUBY_VERSION_MAJOR) if(RUBY_VERSION_MAJOR)