database/mariadb-connector-c
1
0
Fork 0
mirror of https://github.com/mariadb-corporation/mariadb-connector-c.git synced 2025-08-08 14:02:17 +03:00
Code Activity

renoved unused include

Browse Source 
added some status information
This commit is contained in:
Georg Richter
2014-10-22 17:16:27 +02:00
parent b916eefa45
commit 98aad385c4
2 changed files with 16 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
CMakeLists.txt
View File

@@ -98,7 +98,6 @@ SET(DEFAULT_CHARSET_HOME "${CMAKE_INSTALL_PREFIX}")
SET(PLUGINDIR "${CMAKE_INSTALL_PREFIX}/lib/plugin") SET(PLUGINDIR "${CMAKE_INSTALL_PREFIX}/lib/plugin")
INCLUDE(${CMAKE_SOURCE_DIR}/cmake/SearchLibrary.cmake) INCLUDE(${CMAKE_SOURCE_DIR}/cmake/SearchLibrary.cmake)
INCLUDE(CMakePackageConfigHelpers)
IF(WITH_EXTERNAL_ZLIB) IF(WITH_EXTERNAL_ZLIB)
FIND_PACKAGE(ZLIB QUIET) FIND_PACKAGE(ZLIB QUIET)
@@ -196,11 +195,11 @@ IF(IS_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/unittest)
ADD_SUBDIRECTORY(unittest/libmariadb) ADD_SUBDIRECTORY(unittest/libmariadb)
ENDIF() ENDIF()
IF(BUILD_DOCS) IF(CLIENT_DOCS)
ADD_SUBDIRECTORY(docs) INSTALL(DIRECTORY ${CLIENT_DOCS}
DESTINATION .)
ENDIF() ENDIF()
IF(MSVC) IF(MSVC)
SET(CMAKE_INSTALL_PREFIX "") SET(CMAKE_INSTALL_PREFIX "")
ENDIF() ENDIF()
@@ -254,3 +253,16 @@ ELSE()
SET(CPACK_SOURCE_GENERATOR "TGZ") SET(CPACK_SOURCE_GENERATOR "TGZ")
ENDIF() ENDIF()
INCLUDE(CPack) INCLUDE(CPack)
MESSAGE(STATUS "MariaDB Connector/c configuration:")
MESSAGE(STATUS "CPack generation: ${CPACK_GENERATOR}")
IF(CLIENT_DOCS)
MESSAGE(STATUS "Documentation included from ${CLIENT_DOCS}")
ENDIF()
MESSAGE(STATUS "SSL support: ${WITH_OPENSSL}")
MESSAGE(STATUS "Experimental Sqlite support: ${WITH_SQLITE}")
IF(WITH_EXTERNAL_ZLIB)
MESSAGE(STATUS "Zlib support: ${WITH_EXTERNAL_ZLIB}")
ELSE()
MESSAGE(STATUS "Zlib support: yes (using bundled zlib)")
ENDIF()

1
unittest/libmariadb/ssl.c.in
View File

@@ -600,7 +600,6 @@ int main(int argc, char **argv)
if (argc > 1) if (argc > 1)
get_options(argc, argv); get_options(argc, argv);
run_tests(my_tests); run_tests(my_tests);
mysql_server_end(); mysql_server_end();