diff options
| author | Jan Lindström <jan.lindstrom@mariadb.com> | 2015-06-24 07:16:08 +0300 |
|---|---|---|
| committer | Jan Lindström <jan.lindstrom@mariadb.com> | 2015-06-24 07:16:08 +0300 |
| commit | 2e4984c185ddcd2da789017cd147338846ff409a (patch) | |
| tree | 0293831900c860600efbaa747ea886d9d1cbf5bd /storage/mroonga/vendor/groonga/plugins/query_expanders/CMakeLists.txt | |
| parent | 792b53e80806df893ee62c9a1c1bd117114c8c6d (diff) | |
| parent | a6087e7dc1ef3561d8189c8db15e9591d0f9b520 (diff) | |
| download | mariadb-git-10.0-FusionIO.tar.gz | |
Merge tag 'mariadb-10.0.20' into 10.0-FusionIO10.0-FusionIO
Conflicts:
storage/innobase/os/os0file.cc
storage/xtradb/os/os0file.cc
storage/xtradb/srv/srv0start.cc
Diffstat (limited to 'storage/mroonga/vendor/groonga/plugins/query_expanders/CMakeLists.txt')
| -rw-r--r-- | storage/mroonga/vendor/groonga/plugins/query_expanders/CMakeLists.txt | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/storage/mroonga/vendor/groonga/plugins/query_expanders/CMakeLists.txt b/storage/mroonga/vendor/groonga/plugins/query_expanders/CMakeLists.txt index 1e2a2c23b09..57d11abfbcb 100644 --- a/storage/mroonga/vendor/groonga/plugins/query_expanders/CMakeLists.txt +++ b/storage/mroonga/vendor/groonga/plugins/query_expanders/CMakeLists.txt @@ -27,6 +27,4 @@ set_target_properties(tsv_query_expander PROPERTIES PREFIX "" OUTPUT_NAME "tsv") target_link_libraries(tsv_query_expander libgroonga) -if(NOT MRN_GROONGA_BUNDLED) - install(TARGETS tsv_query_expander DESTINATION "${QUERY_EXPANDERS_DIR}") -endif() +install(TARGETS tsv_query_expander DESTINATION "${QUERY_EXPANDERS_DIR}") |