From 92d6c13206b199f24384ed2504ed479b0f59c314 Mon Sep 17 00:00:00 2001 From: Vladislav Vaintroub Date: Tue, 21 Jan 2020 21:41:16 +0100 Subject: MDEV-21548 Explicitly declare sql_bultins library STATIC. Someone tried -DBUILD_SHARED_LIBS:BOOL=ON. This did not work well --- sql/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'sql/CMakeLists.txt') diff --git a/sql/CMakeLists.txt b/sql/CMakeLists.txt index 437f496f1f1..23c66576b19 100644 --- a/sql/CMakeLists.txt +++ b/sql/CMakeLists.txt @@ -289,7 +289,7 @@ IF(MSVC AND NOT WITHOUT_DYNAMIC_PLUGINS) SET_TARGET_PROPERTIES(mysqld_import_lib PROPERTIES IMPORTED_LOCATION ${MYSQLD_LIB}) ENDIF() -ADD_LIBRARY( sql_builtins ${CMAKE_CURRENT_BINARY_DIR}/sql_builtin.cc) +ADD_LIBRARY(sql_builtins STATIC ${CMAKE_CURRENT_BINARY_DIR}/sql_builtin.cc) TARGET_LINK_LIBRARIES(sql_builtins ${MYSQLD_STATIC_PLUGIN_LIBS}) MYSQL_ADD_EXECUTABLE(mysqld ${MYSQLD_SOURCE} DESTINATION ${INSTALL_SBINDIR} COMPONENT Server) -- cgit v1.2.1