Skip to content

Commit 284ed64

Browse files
vaintroubvuvova
authored andcommitted
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.
1 parent 62d4e7e commit 284ed64

File tree

2 files changed

+4
-2
lines changed

2 files changed

+4
-2
lines changed

libmysqld/CMakeLists.txt

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -149,6 +149,9 @@ ADD_DEPENDENCIES(sql_embedded GenError GenServerSource)
149149
IF(TARGET pcre2)
150150
ADD_DEPENDENCIES(sql_embedded pcre2)
151151
ENDIF()
152+
IF(TARGET libfmt)
153+
ADD_DEPENDENCIES(sql_embedded libfmt)
154+
ENDIF()
152155

153156
# On Windows, static embedded server library is called mysqlserver.lib
154157
# On Unix, it is libmysqld.a
@@ -402,4 +405,3 @@ IF(NOT DISABLE_SHARED)
402405
ENDIF()
403406
ENDIF()
404407
ENDIF()
405-

sql/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -392,7 +392,7 @@ ADD_CUSTOM_TARGET(
392392
)
393393

394394
IF(TARGET libfmt)
395-
ADD_DEPENDENCIES(GenServerSource libfmt)
395+
ADD_DEPENDENCIES(sql libfmt)
396396
ENDIF()
397397

398398
IF(WIN32 OR HAVE_DLOPEN AND NOT DISABLE_SHARED)

0 commit comments

Comments
 (0)