diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2011-07-16 09:07:41 +0200 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2011-07-16 09:07:41 +0200 |
| commit | 66a8da067793b717df0d4682357df15cba3c935f (patch) | |
| tree | 48033cb49e0853e1256ddfded9ee5a244e25410e | |
| parent | d89c19ceaab8cac24d581fbbd5cb9b06f5f917d4 (diff) | |
| download | mariadb-git-66a8da067793b717df0d4682357df15cba3c935f.tar.gz | |
compilation fixes: without dbug, without ssl
| -rw-r--r-- | libmysql/CMakeLists.txt | 6 | ||||
| -rw-r--r-- | mysys/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | sql/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | sql/sql_acl.cc | 2 | ||||
| -rw-r--r-- | storage/heap/CMakeLists.txt | 4 |
5 files changed, 6 insertions, 10 deletions
diff --git a/libmysql/CMakeLists.txt b/libmysql/CMakeLists.txt index 8bacc312087..34bc20d77a1 100644 --- a/libmysql/CMakeLists.txt +++ b/libmysql/CMakeLists.txt @@ -150,11 +150,7 @@ ADD_CONVENIENCE_LIBRARY(clientlib ${CLIENT_SOURCES}) DTRACE_INSTRUMENT(clientlib) ADD_DEPENDENCIES(clientlib GenError) -SET(LIBS clientlib dbug strings vio mysys ${ZLIB_LIBRARY} ${SSL_LIBRARIES} ${LIBDL}) - -IF(WITH_AUTHENTICATION_WIN) - LIST(APPEND LIBS auth_win_client) -ENDIF(WITH_AUTHENTICATION_WIN) +SET(LIBS clientlib ${DBUG_LIBRARY} strings vio mysys ${ZLIB_LIBRARY} ${SSL_LIBRARIES} ${LIBDL}) # Merge several convenience libraries into one big mysqlclient # and link them together into shared library. diff --git a/mysys/CMakeLists.txt b/mysys/CMakeLists.txt index e32a722ff05..662a4c79757 100644 --- a/mysys/CMakeLists.txt +++ b/mysys/CMakeLists.txt @@ -66,7 +66,7 @@ IF(HAVE_MLOCK) ENDIF() ADD_CONVENIENCE_LIBRARY(mysys ${MYSYS_SOURCES}) -TARGET_LINK_LIBRARIES(mysys dbug strings ${ZLIB_LIBRARY} +TARGET_LINK_LIBRARIES(mysys ${DBUG_LIBRARY} strings ${ZLIB_LIBRARY} ${LIBNSL} ${LIBM} ${LIBRT}) DTRACE_INSTRUMENT(mysys) diff --git a/sql/CMakeLists.txt b/sql/CMakeLists.txt index 966522b5aa3..73f7eef4a0a 100644 --- a/sql/CMakeLists.txt +++ b/sql/CMakeLists.txt @@ -90,7 +90,7 @@ ADD_LIBRARY(sql STATIC ${SQL_SOURCE}) ADD_DEPENDENCIES(sql GenServerSource) DTRACE_INSTRUMENT(sql) TARGET_LINK_LIBRARIES(sql ${MYSQLD_STATIC_PLUGIN_LIBS} - mysys dbug strings vio regex + mysys ${DBUG_LIBRARY} strings vio regex ${LIBWRAP} ${LIBCRYPT} ${LIBDL} ${SSL_LIBRARIES}) diff --git a/sql/sql_acl.cc b/sql/sql_acl.cc index c800f4c6bac..61c4d05425c 100644 --- a/sql/sql_acl.cc +++ b/sql/sql_acl.cc @@ -532,11 +532,11 @@ static uchar* acl_entry_get_key(acl_entry *entry, size_t *length, second packet? */ #define SSL_HANDSHAKE_SIZE 2 -#define NORMAL_HANDSHAKE_SIZE 6 #define MIN_HANDSHAKE_SIZE 2 #else #define MIN_HANDSHAKE_SIZE 6 #endif /* HAVE_OPENSSL && !EMBEDDED_LIBRARY */ +#define NORMAL_HANDSHAKE_SIZE 6 static DYNAMIC_ARRAY acl_hosts, acl_users, acl_dbs, acl_proxy_users; static MEM_ROOT mem, memex; diff --git a/storage/heap/CMakeLists.txt b/storage/heap/CMakeLists.txt index 8f3c1be809f..74f6ce8d333 100644 --- a/storage/heap/CMakeLists.txt +++ b/storage/heap/CMakeLists.txt @@ -25,7 +25,7 @@ SET(HEAP_SOURCES _check.c _rectest.c hp_block.c hp_clear.c hp_close.c hp_create MYSQL_ADD_PLUGIN(heap ${HEAP_SOURCES} STORAGE_ENGINE MANDATORY RECOMPILE_FOR_EMBEDDED) ADD_EXECUTABLE(hp_test1 hp_test1.c) -TARGET_LINK_LIBRARIES(hp_test1 mysys heap dbug strings) +TARGET_LINK_LIBRARIES(hp_test1 heap mysys ${DBUG_LIBRARY} strings) ADD_EXECUTABLE(hp_test2 hp_test2.c) -TARGET_LINK_LIBRARIES(hp_test2 mysys heap dbug strings) +TARGET_LINK_LIBRARIES(hp_test2 heap mysys ${DBUG_LIBRARY} strings) |