diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2017-03-28 19:34:51 +0200 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2017-03-29 00:39:37 +0200 |
| commit | a00517ac9707ffd51c092f5af5d198c5ee789bb4 (patch) | |
| tree | 6b7438c1973307789b7b523477458ce7e452dec8 | |
| parent | 9ab9a28b5d9ff7fd175ae64b0d9e3c984dfb0abf (diff) | |
| download | mariadb-git-a00517ac9707ffd51c092f5af5d198c5ee789bb4.tar.gz | |
restore the correct linking of ed25519 plugin
* add a clarifying comment
* apply /wd4244 /wd4146 to ref10 source files, not to the library
| -rw-r--r-- | plugin/auth_ed25519/CMakeLists.txt | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/plugin/auth_ed25519/CMakeLists.txt b/plugin/auth_ed25519/CMakeLists.txt index f340218dc02..73d8eeb208b 100644 --- a/plugin/auth_ed25519/CMakeLists.txt +++ b/plugin/auth_ed25519/CMakeLists.txt @@ -16,11 +16,14 @@ INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) ADD_CONVENIENCE_LIBRARY(ref10 ${REF10_SOURCES}) IF(MSVC) # Silence conversion (integer truncantion) warnings from reference code - SET_TARGET_PROPERTIES(ref10 PROPERTIES COMPILE_FLAGS "/wd4244 /wd4146") + SET_SOURCE_FILES_PROPERTIES(${REF10_SOURCES} PROPERTY COMPILE_FLAGS "/wd4244 /wd4146") ENDIF() -MYSQL_ADD_PLUGIN(auth_ed25519 server_ed25519.c MODULE_ONLY LINK_LIBRARIES ref10) +# server plugin *cannot* link with the library, it needs all sources to be +# compiled with MYSQL_DYNAMIC_PLUGIN +MYSQL_ADD_PLUGIN(auth_ed25519 server_ed25519.c ${REF10_SOURCES} MODULE_ONLY) +# client plugin and unit test ed25519-t can use the library MYSQL_ADD_PLUGIN(client_ed25519 client_ed25519.c MODULE_ONLY CLIENT LINK_LIBRARIES mysys_ssl ref10 COMPONENT ClientPlugins) |