summaryrefslogtreecommitdiff
path: root/extra
diff options
context:
space:
mode:
authorVladislav Vaintroub <wlad@mariadb.com>2019-06-28 13:21:39 +0200
committerSergei Krivonos <sergei.krivonos@mariadb.com>2021-11-09 17:02:45 +0200
commit009f3e06f3e74303559df59db404b300a12241d3 (patch)
tree6b25c133b361fb601ed8c9acd7dfa7136fe3b713 /extra
parent7acf31783c93b54e04d42c9ecec7c7426f5ca31f (diff)
downloadmariadb-git-009f3e06f3e74303559df59db404b300a12241d3.tar.gz
improve build, allow sql library to be built in parallel with builtins
Diffstat (limited to 'extra')
-rw-r--r--extra/mariabackup/CMakeLists.txt6
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()