diff options
Diffstat (limited to 'libmysqld/CMakeLists.txt')
| -rw-r--r-- | libmysqld/CMakeLists.txt | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/libmysqld/CMakeLists.txt b/libmysqld/CMakeLists.txt index 6cff07ee132..490c2ed41b5 100644 --- a/libmysqld/CMakeLists.txt +++ b/libmysqld/CMakeLists.txt @@ -1,5 +1,5 @@ # Copyright (c) 2006, 2011, Oracle and/or its affiliates. -# Copyright (c) 2009, 2020, MariaDB Corporation +# Copyright (c) 2009, 2022, MariaDB Corporation # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -24,6 +24,7 @@ ${CMAKE_SOURCE_DIR}/sql ${CMAKE_SOURCE_DIR}/tpool ${CMAKE_BINARY_DIR}/sql ${PCRE_INCLUDES} +${LIBFMT_INCLUDE_DIR} ${ZLIB_INCLUDE_DIR} ${SSL_INCLUDE_DIRS} ${SSL_INTERNAL_INCLUDE_DIRS} @@ -94,7 +95,7 @@ SET(SQL_EMBEDDED_SOURCES emb_qcache.cc libmysqld.c lib_sql.cc ../sql/select_handler.cc ../sql/sql_show.cc ../sql/sql_state.c ../sql/sql_statistics.cc ../sql/sql_string.cc - ../sql/sql_tablespace.cc ../sql/sql_table.cc ../sql/sql_test.cc + ../sql/sql_table.cc ../sql/sql_test.cc ../sql/ddl_log.cc ../sql/sql_trigger.cc ../sql/sql_udf.cc ../sql/sql_union.cc ../sql/sql_update.cc ../sql/sql_view.cc ../sql/sql_profile.cc @@ -145,6 +146,7 @@ SET(SQL_EMBEDDED_SOURCES emb_qcache.cc libmysqld.c lib_sql.cc ../sql/opt_trace.cc ../sql/xa.cc ../sql/json_table.cc + ../sql/opt_histogram_json.cc ${GEN_SOURCES} ${MYSYS_LIBWRAP_SOURCE} ) @@ -156,6 +158,9 @@ ADD_DEPENDENCIES(sql_embedded GenError GenServerSource) IF(TARGET pcre2) ADD_DEPENDENCIES(sql_embedded pcre2) ENDIF() +IF(TARGET libfmt) + ADD_DEPENDENCIES(sql_embedded libfmt) +ENDIF() TARGET_LINK_LIBRARIES(sql_embedded LINK_PRIVATE tpool ${CRC32_LIBRARY}) # On Windows, static embedded server library is called mysqlserver.lib |