diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2021-09-30 10:38:44 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2021-09-30 10:38:44 +0300 |
| commit | a49e394399859b23ba609d0058b498cfa876cac4 (patch) | |
| tree | d0f1a85011d7e99078624c2185a9ba69796a4262 /libmysqld | |
| parent | 260649de0472e90be665ae2c442c4435e125b022 (diff) | |
| parent | be803f037f98812410f24b67af61aa7857969dcf (diff) | |
| download | mariadb-git-a49e394399859b23ba609d0058b498cfa876cac4.tar.gz | |
Merge 10.5 into 10.6
Diffstat (limited to 'libmysqld')
| -rw-r--r-- | libmysqld/CMakeLists.txt | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/libmysqld/CMakeLists.txt b/libmysqld/CMakeLists.txt index efdf7277e5b..c8e75c897b9 100644 --- a/libmysqld/CMakeLists.txt +++ b/libmysqld/CMakeLists.txt @@ -145,6 +145,9 @@ SET(SQL_EMBEDDED_SOURCES emb_qcache.cc libmysqld.c lib_sql.cc ADD_CONVENIENCE_LIBRARY(sql_embedded ${SQL_EMBEDDED_SOURCES}) DTRACE_INSTRUMENT(sql_embedded) ADD_DEPENDENCIES(sql_embedded GenError GenServerSource) +IF(TARGET pcre2) + ADD_DEPENDENCIES(sql_embedded pcre2) +ENDIF() # On Windows, static embedded server library is called mysqlserver.lib # On Unix, it is libmysqld.a |