diff options
| author | unknown <kent@kent-amd64.(none)> | 2007-08-02 15:39:34 +0200 |
|---|---|---|
| committer | unknown <kent@kent-amd64.(none)> | 2007-08-02 15:39:34 +0200 |
| commit | 6e20710c6c2fd7cbf356a6a6a866c38ef39ef3a3 (patch) | |
| tree | ddc45f644defc1eae6a7db29b45cfe3c00c22cfc /sql | |
| parent | 4fa1ad315fed9a70418d031f791f612e51fabb1d (diff) | |
| parent | def8d6b36399708c7e1dd28d13178b303ed14d14 (diff) | |
| download | mariadb-git-6e20710c6c2fd7cbf356a6a6a866c38ef39ef3a3.tar.gz | |
Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.0-build
into mysql.com:/home/kent/bk/cmake-tls/mysql-5.0-build
Diffstat (limited to 'sql')
| -rwxr-xr-x | sql/CMakeLists.txt | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/sql/CMakeLists.txt b/sql/CMakeLists.txt index 0cbeb97184f..6726fdfd85a 100755 --- a/sql/CMakeLists.txt +++ b/sql/CMakeLists.txt @@ -51,7 +51,7 @@ ADD_EXECUTABLE(mysqld${MYSQLD_EXE_SUFFIX} discover.cc ../libmysql/errmsg.c field.cc field_conv.cc filesort.cc gstream.cc ha_blackhole.cc ha_archive.cc ha_heap.cc ha_myisam.cc ha_myisammrg.cc - ha_innodb.cc ha_federated.cc ha_berkeley.cc ha_blackhole.cc + ha_innodb.cc ha_federated.cc ha_berkeley.cc handler.cc hash_filo.cc hash_filo.h hostname.cc init.cc item.cc item_buff.cc item_cmpfunc.cc item_create.cc item_func.cc item_geofunc.cc item_row.cc @@ -128,8 +128,9 @@ ADD_CUSTOM_COMMAND( DEPENDS ${PROJECT_SOURCE_DIR}/sql/message.mc) # Gen_lex_hash +# About "mysqlclient_notls", see note in "client/CMakeLists.txt" ADD_EXECUTABLE(gen_lex_hash gen_lex_hash.cc) -TARGET_LINK_LIBRARIES(gen_lex_hash dbug mysqlclient wsock32) +TARGET_LINK_LIBRARIES(gen_lex_hash mysqlclient_notls wsock32) GET_TARGET_PROPERTY(GEN_LEX_HASH_EXE gen_lex_hash LOCATION) ADD_CUSTOM_COMMAND( OUTPUT ${PROJECT_SOURCE_DIR}/sql/lex_hash.h |