diff options
| author | Vladislav Vaintroub <wlad@mariadb.com> | 2020-07-03 21:49:45 +0200 |
|---|---|---|
| committer | Vladislav Vaintroub <wlad@mariadb.com> | 2020-07-04 11:53:26 +0200 |
| commit | 272828a171417c2cc7b27b7e3aad18c85bb7d0be (patch) | |
| tree | 993dea827655fce69cc74eb5abff5d9e8b1aaaaf /sql/CMakeLists.txt | |
| parent | d15c839c0dab4016eb425fdb109a5dd8ecd918a4 (diff) | |
| parent | 7a4afad969e5cb903cdf82386398a75710f5ed80 (diff) | |
| download | mariadb-git-272828a171417c2cc7b27b7e3aad18c85bb7d0be.tar.gz | |
Merge branch '10.5' into 10.6
Diffstat (limited to 'sql/CMakeLists.txt')
| -rw-r--r-- | sql/CMakeLists.txt | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/CMakeLists.txt b/sql/CMakeLists.txt index e01cb79e289..c2bf0c68f2f 100644 --- a/sql/CMakeLists.txt +++ b/sql/CMakeLists.txt @@ -76,6 +76,8 @@ IF(SSL_DEFINES) ENDIF() SET (SQL_SOURCE + ${CMAKE_CURRENT_BINARY_DIR}/sql_yacc.cc + ${CMAKE_CURRENT_BINARY_DIR}/sql_yacc_ora.cc ../sql-common/client.c compat56.cc derror.cc des_key_file.cc discover.cc ../sql-common/errmsg.c field.cc field_conv.cc field_comp.cc @@ -156,8 +158,6 @@ SET (SQL_SOURCE opt_trace.cc table_cache.cc encryption.cc temporary_tables.cc proxy_protocol.cc backup.cc xa.cc - ${CMAKE_CURRENT_BINARY_DIR}/sql_yacc.cc - ${CMAKE_CURRENT_BINARY_DIR}/sql_yacc_ora.cc ${CMAKE_CURRENT_BINARY_DIR}/lex_hash.h ${CMAKE_CURRENT_BINARY_DIR}/lex_token.h ${GEN_SOURCES} |