diff options
| author | Rafal Somla <rafal.somla@oracle.com> | 2011-04-28 21:17:29 +0200 |
|---|---|---|
| committer | Rafal Somla <rafal.somla@oracle.com> | 2011-04-28 21:17:29 +0200 |
| commit | c8e48ac3a495ba8f0568acf3a32df25505cd1b55 (patch) | |
| tree | bd892aab620dc4445a50c9cacc33c5feddfbe420 /libmysql/CMakeLists.txt | |
| parent | f710d831bcd6856d2e0722c5185d8638073a3c37 (diff) | |
| download | mariadb-git-c8e48ac3a495ba8f0568acf3a32df25505cd1b55.tar.gz | |
Bug#11766631 (59780) - Move the client authentication_windows plugin
into the server repository
This patch adds client windows authentication plugin code to the client
library libmysql (only on Windows platform). The plugin is compiled into
the library and added to the list of built-in plugins. This way clients
should be able to connect to a server which uses windows authentication
plugin even as an SQL user which uses such authentication.
Note: this makes the client library to depend on Secur32 Windows system
library. When building clients, they must be linked against Secur32.
Command mysql_config --libs correctly lists Secur32 as a required
dependency.
Diffstat (limited to 'libmysql/CMakeLists.txt')
| -rw-r--r-- | libmysql/CMakeLists.txt | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/libmysql/CMakeLists.txt b/libmysql/CMakeLists.txt index d7426c465d8..d0e383c6640 100644 --- a/libmysql/CMakeLists.txt +++ b/libmysql/CMakeLists.txt @@ -1,4 +1,4 @@ -# Copyright (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2006, 2011, Oracle and/or its affiliates. All rights reserved. # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -134,6 +134,12 @@ CACHE INTERNAL "Functions exported by client API" ) +IF(WIN32) + ADD_SUBDIRECTORY(authentication_win) + SET(WITH_AUTHENTICATION_WIN 1) + ADD_DEFINITIONS(-DAUTHENTICATION_WIN) +ENDIF(WIN32) + SET(CLIENT_SOURCES get_password.c libmysql.c @@ -151,6 +157,10 @@ 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) + # Merge several convenience libraries into one big mysqlclient # and link them together into shared library. MERGE_LIBRARIES(mysqlclient STATIC ${LIBS} COMPONENT Development) |