diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2017-05-08 14:58:49 +0200 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2017-05-08 14:58:49 +0200 |
| commit | d738722eeee34df67081f8afe5ccd5d28c1e275f (patch) | |
| tree | 5aae42ea58c5f9a474ce584c2881894bd194b2b7 /sql/CMakeLists.txt | |
| parent | e1efeaa5502f640102881f415d604cc10fbf54a9 (diff) | |
| parent | 1c418df7228ff3eaa1f9a1d9d630cb46947da781 (diff) | |
| download | mariadb-git-d738722eeee34df67081f8afe5ccd5d28c1e275f.tar.gz | |
Merge branch '10.0' into 10.1
Diffstat (limited to 'sql/CMakeLists.txt')
| -rw-r--r-- | sql/CMakeLists.txt | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/sql/CMakeLists.txt b/sql/CMakeLists.txt index 7a42742a181..54f9da6dd38 100644 --- a/sql/CMakeLists.txt +++ b/sql/CMakeLists.txt @@ -68,6 +68,7 @@ ENDIF() ADD_CUSTOM_COMMAND( OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/lex_token.h COMMAND gen_lex_token > lex_token.h + DEPENDS gen_lex_token ) ADD_DEFINITIONS(-DMYSQL_SERVER -DHAVE_EVENT_SCHEDULER) @@ -322,6 +323,7 @@ ENDIF() ADD_CUSTOM_COMMAND( OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/lex_hash.h COMMAND gen_lex_hash > lex_hash.h + DEPENDS gen_lex_hash ) MYSQL_ADD_EXECUTABLE(mysql_tzinfo_to_sql tztime.cc COMPONENT Server) @@ -446,7 +448,7 @@ IF(WIN32) ${CMAKE_CURRENT_BINARY_DIR}/my_bootstrap.sql mysql_bootstrap_sql.c WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} - DEPENDS ${my_bootstrap_sql} + DEPENDS comp_sql ${my_bootstrap_sql} ) MYSQL_ADD_EXECUTABLE(mysql_install_db |