diff options
| author | Vladislav Vaintroub <wlad@mariadb.com> | 2017-03-24 10:02:31 +0100 |
|---|---|---|
| committer | Vladislav Vaintroub <wlad@mariadb.com> | 2017-03-24 10:10:36 +0100 |
| commit | 716188f1d407acf8181966396d6c0923716f4546 (patch) | |
| tree | 8eb5f6e5abb9541f2058a3b615ddc41b8d28844f /plugin/auth_ed25519 | |
| parent | d7c35a999203c98e772241f1c7858253dd96ac89 (diff) | |
| download | mariadb-git-716188f1d407acf8181966396d6c0923716f4546.tar.gz | |
Fix some warnings on Windows compilation
- silence warnings in ed25519 reference implementation
- fix signed/unsigned warning in popular header item_func.h
Diffstat (limited to 'plugin/auth_ed25519')
| -rw-r--r-- | plugin/auth_ed25519/CMakeLists.txt | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/plugin/auth_ed25519/CMakeLists.txt b/plugin/auth_ed25519/CMakeLists.txt index fb3a841ef9d..f340218dc02 100644 --- a/plugin/auth_ed25519/CMakeLists.txt +++ b/plugin/auth_ed25519/CMakeLists.txt @@ -14,8 +14,12 @@ SET(REF10_SOURCES 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") +ENDIF() -MYSQL_ADD_PLUGIN(auth_ed25519 server_ed25519.c ${REF10_SOURCES} MODULE_ONLY) +MYSQL_ADD_PLUGIN(auth_ed25519 server_ed25519.c MODULE_ONLY LINK_LIBRARIES ref10) MYSQL_ADD_PLUGIN(client_ed25519 client_ed25519.c MODULE_ONLY CLIENT LINK_LIBRARIES mysys_ssl ref10 COMPONENT ClientPlugins) |