diff options
| author | Sébastien Helleu <flashcode@flashtux.org> | 2021-11-21 11:39:56 +0100 |
|---|---|---|
| committer | Sébastien Helleu <flashcode@flashtux.org> | 2021-11-21 11:39:56 +0100 |
| commit | fe9768f484304c28cf4e6d6eb980613b00ca6904 (patch) | |
| tree | cbc39be8d175339ce919dadfbe6f2e7c817a4d5d /cmake | |
| parent | aace0a1a58a5726891e33268d4ad7821f7cd6b24 (diff) | |
| download | weechat-fe9768f484304c28cf4e6d6eb980613b00ca6904.zip | |
ruby: add detection of Ruby 3.0.0, remove old way to detect Ruby (closes #1721)
Diffstat (limited to 'cmake')
| -rw-r--r-- | cmake/FindRuby.cmake | 43 |
1 files changed, 1 insertions, 42 deletions
diff --git a/cmake/FindRuby.cmake b/cmake/FindRuby.cmake index 835d0508c..e92fbc577 100644 --- a/cmake/FindRuby.cmake +++ b/cmake/FindRuby.cmake @@ -33,51 +33,10 @@ endif() find_package(PkgConfig) if(PKG_CONFIG_FOUND) - pkg_search_module(RUBY ruby-2.7 ruby-2.6 ruby-2.5 ruby-2.4 ruby-2.3 ruby-2.2 ruby-2.1 ruby-2.0 ruby-1.9) + pkg_search_module(RUBY ruby-3.0 ruby-2.7 ruby-2.6 ruby-2.5 ruby-2.4 ruby-2.3 ruby-2.2 ruby-2.1 ruby-2.0 ruby-1.9) endif() if(RUBY_FOUND) set(RUBY_LIB "") mark_as_advanced(RUBY_LIB) -else() - find_program(RUBY_EXECUTABLE - NAMES ruby2.7.0 ruby270 ruby2.7 ruby2.6.0 ruby260 ruby2.6 ruby2.5.0 ruby250 ruby2.5 ruby2.4.0 ruby240 ruby2.4 ruby2.3.0 ruby230 ruby2.3 ruby23 ruby2.2.3 ruby223 ruby2.2.2 ruby222 ruby2.2.1 ruby221 ruby2.2.0 ruby220 ruby2.2 ruby22 ruby2.1.7 ruby217 ruby2.1.6 ruby216 ruby2.1.5 ruby215 ruby2.1.4 ruby214 ruby2.1.3 ruby213 ruby2.1.2 ruby212 ruby2.1.1 ruby211 ruby2.1.0 ruby210 ruby2.1 ruby21 ruby2.0 ruby20 ruby1.9.3 ruby193 ruby1.9.2 ruby192 ruby1.9.1 ruby191 ruby1.9 ruby19 ruby - PATHS /usr/bin /usr/local/bin /usr/pkg/bin - ) - if(RUBY_EXECUTABLE) - execute_process( - COMMAND ${RUBY_EXECUTABLE} -r rbconfig -e "print RbConfig::CONFIG['rubyhdrdir'] || RbConfig::CONFIG['archdir']" - OUTPUT_VARIABLE RUBY_ARCH_DIR - ) - execute_process( - COMMAND ${RUBY_EXECUTABLE} -r rbconfig -e "print RbConfig::CONFIG['arch']" - OUTPUT_VARIABLE RUBY_ARCH - ) - execute_process( - COMMAND ${RUBY_EXECUTABLE} -r rbconfig -e "print RbConfig::CONFIG['libdir']" - OUTPUT_VARIABLE RUBY_POSSIBLE_LIB_PATH - ) - execute_process( - COMMAND ${RUBY_EXECUTABLE} -r rbconfig -e "print RbConfig::CONFIG['rubylibdir']" - OUTPUT_VARIABLE RUBY_RUBY_LIB_PATH - ) - find_path(RUBY_INCLUDE_DIRS - NAMES ruby.h - PATHS ${RUBY_ARCH_DIR} - ) - set(RUBY_INCLUDE_ARCH "${RUBY_INCLUDE_DIRS}/${RUBY_ARCH}") - find_library(RUBY_LIB - NAMES ruby-1.9.3 ruby1.9.3 ruby193 ruby-1.9.2 ruby1.9.2 ruby192 ruby-1.9.1 ruby1.9.1 ruby191 ruby1.9 ruby19 ruby - PATHS ${RUBY_POSSIBLE_LIB_PATH} ${RUBY_RUBY_LIB_PATH} - ) - if(RUBY_LIB AND RUBY_INCLUDE_DIRS) - set(RUBY_FOUND TRUE) - endif() - set(RUBY_INCLUDE_DIRS "${RUBY_INCLUDE_DIRS};${RUBY_INCLUDE_ARCH}") - mark_as_advanced( - RUBY_INCLUDE_DIRS - RUBY_LIBRARY_DIRS - RUBY_LIB - ) - endif() endif() |