diff options
| author | unknown <joerg@trift2.> | 2007-08-02 21:49:42 +0200 |
|---|---|---|
| committer | unknown <joerg@trift2.> | 2007-08-02 21:49:42 +0200 |
| commit | 02daa6f378b5737ff6377a473d7e50a255cf4faf (patch) | |
| tree | ca5fda35fc68141abc71e8355a8c94ee1f0dc477 /sql/CMakeLists.txt | |
| parent | 50cb2b97b52a1b87f48bf974203c1e8da06c42fe (diff) | |
| parent | 4d2630ed467c57aac0bf96abde6d80e7ea45b247 (diff) | |
| download | mariadb-git-02daa6f378b5737ff6377a473d7e50a255cf4faf.tar.gz | |
Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-5.0-build
into trift2.:/MySQL/M50/push-5.0
sql/CMakeLists.txt:
Auto merged
Diffstat (limited to 'sql/CMakeLists.txt')
| -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 b0553f622f8..735b930168d 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 |