diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2021-05-25 15:38:57 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2021-05-25 15:38:57 +0300 |
| commit | 1dea7f79779d13695876b84ebecbf41c13d845cb (patch) | |
| tree | fec8bf2607e69a9c6069001bb0de1f33fcae46ba /storage/mroonga/vendor | |
| parent | 04de651725c3eeee8f216c55e2f8133e4547fadb (diff) | |
| parent | 1864a8ea93aa1d1a540c83526a25df2ad0330763 (diff) | |
| download | mariadb-git-1dea7f79779d13695876b84ebecbf41c13d845cb.tar.gz | |
Merge 10.3 into 10.4
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) |