diff options
| author | Sergei Krivonos <sergei.krivonos@mariadb.com> | 2021-11-09 15:40:50 +0200 |
|---|---|---|
| committer | Sergei Krivonos <sergei.krivonos@mariadb.com> | 2021-11-09 15:44:07 +0200 |
| commit | ff08e948d3708a3e9ab40bb492d6d18b8914ecff (patch) | |
| tree | 16d481db1eba13e5dbef65abe31e4a65e736d9f8 /sql/CMakeLists.txt | |
| parent | 9960b98267d3952e30c09c9816364304deb3a242 (diff) | |
| download | mariadb-git-ff08e948d3708a3e9ab40bb492d6d18b8914ecff.tar.gz | |
Revert "In case WITH_WSREP is enabled, build wsrep as plugin"
This reverts commit e45f7f485a4c8133962a4082636412745ed07093.
Diffstat (limited to 'sql/CMakeLists.txt')
| -rw-r--r-- | sql/CMakeLists.txt | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/sql/CMakeLists.txt b/sql/CMakeLists.txt index ec3b0c528bb..4dd34e80f2d 100644 --- a/sql/CMakeLists.txt +++ b/sql/CMakeLists.txt @@ -36,10 +36,9 @@ IF(WITH_WSREP AND NOT EMBEDDED_LIBRARY) wsrep_plugin.cc service_wsrep.cc ) - MYSQL_ADD_PLUGIN(wsrep ${WSREP_SOURCES} MANDATORY EXPORT_SYMBOLS LINK_LIBRARIES wsrep-lib wsrep_api_v26) + SET(WSREP_LIB wsrep-lib wsrep_api_v26) ELSE() - ADD_LIBRARY(wsrep STATIC wsrep_dummy.cc) - ADD_DEPENDENCIES(wsrep GenError) + SET(WSREP_SOURCES wsrep_dummy.cc) ENDIF() INCLUDE_DIRECTORIES( @@ -143,6 +142,7 @@ SET (SQL_SOURCE opt_split.cc rowid_filter.cc rowid_filter.h opt_trace.cc + ${WSREP_SOURCES} table_cache.cc encryption.cc temporary_tables.cc proxy_protocol.cc backup.cc xa.cc ${CMAKE_CURRENT_BINARY_DIR}/sql_yacc.cc @@ -180,10 +180,11 @@ DTRACE_INSTRUMENT(sql) TARGET_LINK_LIBRARIES(sql mysys mysys_ssl dbug strings vio pcre ${LIBWRAP} ${LIBCRYPT} ${CMAKE_DL_LIBS} ${CMAKE_THREAD_LIBS_INIT} + ${WSREP_LIB} ${SSL_LIBRARIES} ${LIBSYSTEMD}) -FOREACH(se aria partition perfschema sql_sequence wsrep) +FOREACH(se aria partition perfschema sql_sequence) # These engines are used directly in sql sources. IF(TARGET ${se}) TARGET_LINK_LIBRARIES(sql ${se}) |