mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-04-20 23:35:32 +02:00
Code Issues Projects Releases Packages Wiki Activity

restore the correct linking of ed25519 plugin

Browse source 
* add a clarifying comment
* apply /wd4244 /wd4146 to ref10 source files, not to the library
This commit is contained in:
Sergei Golubchik 2017-03-28 19:34:51 +02:00
commit a00517ac97
1 changed files with 5 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

7
plugin/auth_ed25519/CMakeLists.txt
View file

@ -16,11 +16,14 @@ INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR})
ADD_CONVENIENCE_LIBRARY(ref10 ${REF10_SOURCES}) ADD_CONVENIENCE_LIBRARY(ref10 ${REF10_SOURCES})
IF(MSVC) IF(MSVC)
# Silence conversion (integer truncantion) warnings from reference code # 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() 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 MYSQL_ADD_PLUGIN(client_ed25519 client_ed25519.c MODULE_ONLY
CLIENT LINK_LIBRARIES mysys_ssl ref10 COMPONENT ClientPlugins) CLIENT LINK_LIBRARIES mysys_ssl ref10 COMPONENT ClientPlugins)