From 91dab5ddb6accbb256e7089aea8ba38e66a1b0cf Mon Sep 17 00:00:00 2001 From: Sergei Golubchik Date: Tue, 2 Jun 2015 18:09:53 +0200 Subject: [PATCH] fix cmake dependencies perfschema after 5.6 merge depends on sql_yacc.h --- storage/perfschema/CMakeLists.txt | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/storage/perfschema/CMakeLists.txt b/storage/perfschema/CMakeLists.txt index e7f4179abf3..efc995b5d23 100644 --- a/storage/perfschema/CMakeLists.txt +++ b/storage/perfschema/CMakeLists.txt @@ -182,6 +182,9 @@ table_session_account_connect_attrs.cc ) MYSQL_ADD_PLUGIN(perfschema ${PERFSCHEMA_SOURCES} STORAGE_ENGINE DEFAULT STATIC_ONLY) -IF(WITH_PERFSCHEMA_STORAGE_ENGINE AND WITH_UNIT_TESTS) - ADD_SUBDIRECTORY(unittest) -ENDIF() +IF (TARGET perfschema) + ADD_DEPENDENCIES(perfschema GenServerSource) + IF(WITH_UNIT_TESTS) + ADD_SUBDIRECTORY(unittest) + ENDIF(WITH_UNIT_TESTS) +ENDIF(TARGET perfschema)