diff options
author | Vladislav Vaintroub <wlad@mariadb.com> | 2019-06-28 13:21:39 +0200 |
---|---|---|
committer | Sergei Krivonos <sergeikrivonos@gmail.com> | 2021-11-09 12:06:49 +0200 |
commit | 1a3570dec35733e725cc6000a06ec666facf4235 (patch) | |
tree | debf733c12dd5b2e497056f328430aba620a63d4 /extra | |
parent | b17576322b600f53c7a0b74cf14830ad5bbad98e (diff) | |
download | mariadb-git-1a3570dec35733e725cc6000a06ec666facf4235.tar.gz |
improve build, allow sql library to be built in parallel with builtins
Diffstat (limited to 'extra')
-rw-r--r-- | extra/mariabackup/CMakeLists.txt | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/extra/mariabackup/CMakeLists.txt b/extra/mariabackup/CMakeLists.txt index 75c942c8a7b..3179e1550c9 100644 --- a/extra/mariabackup/CMakeLists.txt +++ b/extra/mariabackup/CMakeLists.txt @@ -75,6 +75,7 @@ MYSQL_ADD_EXECUTABLE(mariabackup backup_mysql.cc backup_copy.cc encryption_plugin.cc + ${PROJECT_BINARY_DIR}/sql/sql_builtin.cc ${PROJECT_SOURCE_DIR}/sql/net_serv.cc ${NT_SERVICE_SOURCE} ${PROJECT_SOURCE_DIR}/libmysqld/libmysql.c @@ -82,13 +83,14 @@ MYSQL_ADD_EXECUTABLE(mariabackup ) + + # Export all symbols on Unix, for better crash callstacks SET_TARGET_PROPERTIES(mariabackup PROPERTIES ENABLE_EXPORTS TRUE) ADD_SUBDIRECTORY(crc) -TARGET_LINK_LIBRARIES(mariabackup sql crc) - +TARGET_LINK_LIBRARIES(mariabackup sql sql_builtins crc) IF(NOT HAVE_SYSTEM_REGEX) TARGET_LINK_LIBRARIES(mariabackup pcreposix) ENDIF() |