summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSébastien Helleu <flashcode@flashtux.org>2015-06-10 23:17:19 +0200
committerSébastien Helleu <flashcode@flashtux.org>2015-06-10 23:17:19 +0200
commit515e8b7b1ad5379ac569dfe53576790caca84337 (patch)
tree199ef157b88d5eca0f2336b4f61138c4b77002c6
parentbce7a6d43408e198233d0f97afc921e5f8fc9d5a (diff)
downloadweechat-515e8b7b1ad5379ac569dfe53576790caca84337.zip
ruby: add detection of Ruby 2.2
-rw-r--r--ChangeLog.asciidoc1
-rw-r--r--cmake/FindRuby.cmake2
2 files changed, 2 insertions, 1 deletions
diff --git a/ChangeLog.asciidoc b/ChangeLog.asciidoc
index f6fafae67..ac96582a1 100644
--- a/ChangeLog.asciidoc
+++ b/ChangeLog.asciidoc
@@ -27,6 +27,7 @@ https://weechat.org/files/releasenotes/ReleaseNotes-devel.html[release notes]
(closes #436)
* irc: fix errors displayed on WHOX messages received (closes #376)
* lua: add detection of Lua 5.3
+* ruby: add detection of Ruby 2.2
* xfer: fix parsing of DCC chat messages (handle "\r\n" at the end of messages)
(closes #425, closes #426)
* doc: replace PREFIX with CMAKE_INSTALL_PREFIX in cmake instructions
diff --git a/cmake/FindRuby.cmake b/cmake/FindRuby.cmake
index 7b603f4a0..eec32a53d 100644
--- a/cmake/FindRuby.cmake
+++ b/cmake/FindRuby.cmake
@@ -33,7 +33,7 @@ endif()
find_package(PkgConfig)
if(PKG_CONFIG_FOUND)
- pkg_search_module(RUBY ruby-2.1 ruby-2.0 ruby-1.9 ruby-1.8)
+ pkg_search_module(RUBY ruby-2.2 ruby-2.1 ruby-2.0 ruby-1.9 ruby-1.8)
endif()
if(RUBY_FOUND)