diff --git a/libmysqld/CMakeLists.txt b/libmysqld/CMakeLists.txt
index 117200b540d..afa1edff421 100644
--- a/libmysqld/CMakeLists.txt
+++ b/libmysqld/CMakeLists.txt
@@ -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()
-
diff --git a/sql/CMakeLists.txt b/sql/CMakeLists.txt
index b4fd19b2194..972cc0b736c 100644
--- a/sql/CMakeLists.txt
+++ b/sql/CMakeLists.txt
@@ -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)