diff options
| -rw-r--r-- | CMakeLists.txt | 9 | ||||
| -rw-r--r-- | storage/xtradb/CMakeLists.txt | 1 |
2 files changed, 10 insertions, 0 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 5c4e0037588..29f672428a9 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -363,6 +363,15 @@ IF(WITH_UNIT_TESTS) ENDIF() ENDIF() +IF(WITH_INNOBASE_STORAGE_ENGINE) + SET(WITH_XTRADB_STORAGE_ENGINE OFF) + IF(PLUGIN_XTRADB STREQUAL STATIC) + SET(PLUGIN_XTRADB DYNAMIC) + ENDIF() +ELSE() + SET(WITH_XTRADB_STORAGE_ENGINE ON) +ENDIF() + SET (MYSQLD_STATIC_PLUGIN_LIBS "" CACHE INTERNAL "") # mariadb_connector_c fetches submodules which is useful for plugins diff --git a/storage/xtradb/CMakeLists.txt b/storage/xtradb/CMakeLists.txt index ba0797dd422..441d2d2773b 100644 --- a/storage/xtradb/CMakeLists.txt +++ b/storage/xtradb/CMakeLists.txt @@ -501,6 +501,7 @@ SET(INNOBASE_SOURCES MYSQL_ADD_PLUGIN(xtradb ${INNOBASE_SOURCES} STORAGE_ENGINE RECOMPILE_FOR_EMBEDDED + MODULE_OUTPUT_NAME ha_innodb LINK_LIBRARIES ${ZLIB_LIBRARY} ${CRC32_VPMSUM_LIBRARY} |