Commit 284ed643 authored by Vladislav Vaintroub's avatar Vladislav Vaintroub Committed by Sergei Golubchik

Fix broken build dependency, when compiling without perfschema

libfmt must be built before sql or sql_embedded target, since compilation
of item_strfunc.cc depends on it.

Previously, GenServerSource depended on libfmt,yet this GenServerSource
is not a  direct or indirect dependency of sql, if -DPLUGIN_PERFSCHEMA=NO
is used in cmake configuration step.
parent 62d4e7e2
......@@ -149,6 +149,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()
# On Windows, static embedded server library is called mysqlserver.lib
# On Unix, it is libmysqld.a
......@@ -402,4 +405,3 @@ IF(NOT DISABLE_SHARED)
ENDIF()
ENDIF()
ENDIF()
......@@ -392,7 +392,7 @@ ADD_CUSTOM_TARGET(
)
IF(TARGET libfmt)
ADD_DEPENDENCIES(GenServerSource libfmt)
ADD_DEPENDENCIES(sql libfmt)
ENDIF()
IF(WIN32 OR HAVE_DLOPEN AND NOT DISABLE_SHARED)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment