From e9000f51ccdd76e5fb65eb538182b848d5d3f874 Mon Sep 17 00:00:00 2001 From: Dario Date: Mon, 12 Oct 2020 13:02:24 +0200 Subject: [PATCH] updates for windows build --- CMakeLists.txt | 13 ++++++++++++- src/proto | 2 +- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index ac11cb377..d415b3f89 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -88,9 +88,20 @@ conan_basic_setup() add_executable(Gradido_LoginServer ${LOCAL_SRCS}) set(CLIENT_PLUGIN_DIALOG OFF) -set(CLIENT_PLUGIN_client_ed25519 OFF) set(CLIENT_PLUGIN_MYSQL_CLEAR_PASSWORD OFF) set(CLIENT_PLUGIN_REMOTE_IO OFF) +IF(WIN32) +#set(CLIENT_PLUGIN_caching_sha2_password OFF) +set(CLIENT_PLUGIN_CACHING_SHA2_PASSWORD OFF) +set(CLIENT_PLUGIN_SHA256_PASSWORD OFF) +set(CLIENT_PLUGIN_AUTH_GSSAPI_CLIENT OFF) +set(CLIENT_PLUGIN_PVIO_NPIPE STATIC) +set(CLIENT_PLUGIN_PVIO_SHMEM STATIC) +set(CLIENT_PLUGIN_CLIENT_ED25519 OFF) +ELSEIF() +set(CLIENT_PLUGIN_client_ed25519 OFF) +ENDIF() + set(WITH_SSL OFF) add_subdirectory("dependencies/mariadb-connector-c") diff --git a/src/proto b/src/proto index 81a461566..ff412f735 160000 --- a/src/proto +++ b/src/proto @@ -1 +1 @@ -Subproject commit 81a461566e46d71533dc3e284fa075d7d68fd020 +Subproject commit ff412f735667b30233c0ce00d461f209ac7dde7c