diff --git a/CMakeLists.txt b/CMakeLists.txt index c31d5b89..b418c02c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -223,7 +223,6 @@ IF(NOT WITH_SSL STREQUAL "OFF") ENDIF() IF(WIN32) IF(WITH_SSL STREQUAL "SCHANNEL") - MESSAGE(STATUS "SSL_TYPE ${SSL_TYPE}") ADD_DEFINITIONS(-DHAVE_SCHANNEL -DHAVE_SSL) SET(SSL_SOURCES "${CMAKE_SOURCE_DIR}/libmariadb/secure/schannel.c" "${CMAKE_SOURCE_DIR}/libmariadb/secure/ma_schannel.c") INCLUDE_DIRECTORIES("${CMAKE_SOURCE_DIR}/plugins/pvio/") diff --git a/libmariadb/CMakeLists.txt b/libmariadb/CMakeLists.txt index 26767358..dcdb192a 100644 --- a/libmariadb/CMakeLists.txt +++ b/libmariadb/CMakeLists.txt @@ -84,7 +84,6 @@ SET(EXPORT_SYMBOLS mysql_get_host_info mysql_get_option mysql_get_optionv - mysql_get_parameters mysql_get_proto_info mysql_get_server_info mysql_get_server_name diff --git a/unittest/libmariadb/CMakeLists.txt b/unittest/libmariadb/CMakeLists.txt index 77867cb2..cee2743e 100644 --- a/unittest/libmariadb/CMakeLists.txt +++ b/unittest/libmariadb/CMakeLists.txt @@ -27,7 +27,7 @@ SET(API_TESTS "async" "basic-t" "fetch" "charset" "logs" "cursor" "errors" "view #exclude following tests from ctests, since we need to run them maually with different credentials SET(MANUAL_TESTS "t_aurora") # Get finger print from server certificate -IF(WITH_SSL) +IF(WITH_SSL AND OPENSSL_FOUND) #create certificates IF(EXISTS "${CMAKE_SOURCE_DIR}/unittest/libmariadb/certs/server-cert.pem")