diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2021-05-24 09:38:49 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2021-05-24 09:38:49 +0300 |
| commit | 1864a8ea93aa1d1a540c83526a25df2ad0330763 (patch) | |
| tree | f6d1ae8e9e696ea8537a395d061f697e5bccd4aa /storage/mroonga/vendor | |
| parent | b01a9fd817d9d8e5941008d6981338eaa7369c83 (diff) | |
| parent | 5c75ba9cadc7877e91d6b712f157ff5623c09c60 (diff) | |
| download | mariadb-git-1864a8ea93aa1d1a540c83526a25df2ad0330763.tar.gz | |
Merge 10.2 into 10.3
Diffstat (limited to 'storage/mroonga/vendor')
| -rw-r--r-- | storage/mroonga/vendor/groonga/CMakeLists.txt | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/storage/mroonga/vendor/groonga/CMakeLists.txt b/storage/mroonga/vendor/groonga/CMakeLists.txt index d271d4c4eb9..2929338d7b1 100644 --- a/storage/mroonga/vendor/groonga/CMakeLists.txt +++ b/storage/mroonga/vendor/groonga/CMakeLists.txt @@ -588,14 +588,13 @@ else() set(GRN_WITH_MESSAGE_PACK FALSE) endif() -find_program(RUBY NAMES - "ruby2.3" "ruby23" - "ruby2.2" "ruby22" - "ruby2.1" "ruby21" - "ruby") - option(GRN_WITH_MRUBY "use mruby" OFF) if(GRN_WITH_MRUBY) + find_program(RUBY NAMES + "ruby2.3" "ruby23" + "ruby2.2" "ruby22" + "ruby2.1" "ruby21" + "ruby") set(MRUBY_INCLUDE_DIRS "${CMAKE_CURRENT_SOURCE_DIR}/vendor/mruby-source/include") set(MRUBY_LIBS mruby) |