diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2021-08-19 12:25:00 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2021-08-19 12:25:00 +0300 |
| commit | f3fcf5f45c9c09242bfb8762a88c26238458e4c2 (patch) | |
| tree | 914f1a5d9bd38b9f9d09d0c39306c80c00e21842 /storage/perfschema | |
| parent | 475f69b98587c2a0842e3fcbfe515e4362ded973 (diff) | |
| parent | 17980e35fafdf0b05c89c11ecafbea96e1cfc5e5 (diff) | |
| download | mariadb-git-f3fcf5f45c9c09242bfb8762a88c26238458e4c2.tar.gz | |
Merge 10.5 to 10.6
Diffstat (limited to 'storage/perfschema')
| -rw-r--r-- | storage/perfschema/CMakeLists.txt | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/storage/perfschema/CMakeLists.txt b/storage/perfschema/CMakeLists.txt index dfb41a5b1c1..2a77e2a8301 100644 --- a/storage/perfschema/CMakeLists.txt +++ b/storage/perfschema/CMakeLists.txt @@ -341,9 +341,8 @@ FAIL_REGEX "warning: incompatible pointer to integer conversion" CONFIGURE_FILE(pfs_config.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/pfs_config.h) MYSQL_ADD_PLUGIN(perfschema ${PERFSCHEMA_SOURCES} STORAGE_ENGINE DEFAULT - STATIC_ONLY RECOMPILE_FOR_EMBEDDED) + STATIC_ONLY RECOMPILE_FOR_EMBEDDED DEPENDS GenServerSource) IF (TARGET perfschema) - ADD_DEPENDENCIES(perfschema GenServerSource) IF(WITH_UNIT_TESTS) ADD_SUBDIRECTORY(unittest) ENDIF(WITH_UNIT_TESTS) |