diff --git a/ChangeLog.asciidoc b/ChangeLog.asciidoc index d7d832666..320288892 100644 --- a/ChangeLog.asciidoc +++ b/ChangeLog.asciidoc @@ -35,6 +35,7 @@ https://weechat.org/files/releasenotes/ReleaseNotes-devel.html[release notes] * irc: fix display of messages sent to server in raw buffer * irc: fix display of invalid UTF-8 chars in raw buffer * relay: display the arrow before client id and protocol in raw buffer +* ruby: fix Ruby detection when pkg-config is not installed == Version 1.3 (2015-08-16) diff --git a/cmake/FindRuby.cmake b/cmake/FindRuby.cmake index eec32a53d..a21d9fd15 100644 --- a/cmake/FindRuby.cmake +++ b/cmake/FindRuby.cmake @@ -41,7 +41,7 @@ if(RUBY_FOUND) mark_as_advanced(RUBY_LIB) else() find_program(RUBY_EXECUTABLE - NAMES ruby1.9.3 ruby193 ruby1.9.2 ruby192 ruby1.9.1 ruby191 ruby1.9 ruby19 ruby1.8 ruby18 ruby + NAMES 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 ruby1.8 ruby18 ruby PATHS /usr/bin /usr/local/bin /usr/pkg/bin ) if(RUBY_EXECUTABLE)