summaryrefslogtreecommitdiff
path: root/storage/mroonga
diff options
context:
space:
mode:
authorSergei Golubchik <serg@mariadb.org>2014-12-02 22:25:53 +0100
committerSergei Golubchik <serg@mariadb.org>2014-12-02 22:25:53 +0100
commit1caee393076dc642a7d8e1283377b59ef8f52dbd (patch)
tree64689062c5ef7c61a506d5e25789cbf8dd3dac50 /storage/mroonga
parent853077ad7e81be1ade20b4beab1b95d5766d87b1 (diff)
downloadmariadb-git-1caee393076dc642a7d8e1283377b59ef8f52dbd.tar.gz
disable mroonga temporarily: see MDEV-7246
Diffstat (limited to 'storage/mroonga')
-rw-r--r--storage/mroonga/CMakeLists.txt12
1 files changed, 4 insertions, 8 deletions
diff --git a/storage/mroonga/CMakeLists.txt b/storage/mroonga/CMakeLists.txt
index faad871fa95..0ca1dd4638b 100644
--- a/storage/mroonga/CMakeLists.txt
+++ b/storage/mroonga/CMakeLists.txt
@@ -240,16 +240,12 @@ link_directories(
if(MRN_BUNDLED)
if(GROONGA_NORMALIZER_MYSQL_FOUND AND MRN_GROONGA_BUNDLED)
- mysql_add_plugin(mroonga
- "${MROONGA_SOURCES};${MRN_UDF_SOURCES};${MRN_GRN_NORMALIZER_MYSQL_SOURCES};${LIBMRN_NEED_MYSQL_SOURCES};${LIBMRN_NO_MYSQL_SOURCES}"
- STORAGE_ENGINE MODULE_ONLY
- LINK_LIBRARIES ${GROONGA_LIBRARIES})
+ set(sources "${MROONGA_SOURCES};${MRN_UDF_SOURCES};${MRN_GRN_NORMALIZER_MYSQL_SOURCES};${LIBMRN_NEED_MYSQL_SOURCES};${LIBMRN_NO_MYSQL_SOURCES}")
else()
- mysql_add_plugin(mroonga
- "${MROONGA_SOURCES};${MRN_UDF_SOURCES};${LIBMRN_NEED_MYSQL_SOURCES};${LIBMRN_NO_MYSQL_SOURCES}"
- STORAGE_ENGINE MODULE_ONLY
- LINK_LIBRARIES ${GROONGA_LIBRARIES})
+ set(sources "${MROONGA_SOURCES};${MRN_UDF_SOURCES};${LIBMRN_NEED_MYSQL_SOURCES};${LIBMRN_NO_MYSQL_SOURCES}")
endif()
+ mysql_add_plugin(mroonga ${sources} STORAGE_ENGINE MODULE_ONLY LINK_LIBRARIES ${GROONGA_LIBRARIES}
+ DISABLED)
else()
else()
add_library(mroonga MODULE