Skip to content

Commit 98aad38

Browse files
committed
renoved unused include
added some status information
1 parent b916eef commit 98aad38

File tree

2 files changed

+16
-5
lines changed

2 files changed

+16
-5
lines changed

CMakeLists.txt

Lines changed: 16 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,6 @@ SET(DEFAULT_CHARSET_HOME "${CMAKE_INSTALL_PREFIX}")
9898
SET(PLUGINDIR "${CMAKE_INSTALL_PREFIX}/lib/plugin")
9999

100100
INCLUDE(${CMAKE_SOURCE_DIR}/cmake/SearchLibrary.cmake)
101-
INCLUDE(CMakePackageConfigHelpers)
102101

103102
IF(WITH_EXTERNAL_ZLIB)
104103
FIND_PACKAGE(ZLIB QUIET)
@@ -196,11 +195,11 @@ IF(IS_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/unittest)
196195
ADD_SUBDIRECTORY(unittest/libmariadb)
197196
ENDIF()
198197

199-
IF(BUILD_DOCS)
200-
ADD_SUBDIRECTORY(docs)
198+
IF(CLIENT_DOCS)
199+
INSTALL(DIRECTORY ${CLIENT_DOCS}
200+
DESTINATION .)
201201
ENDIF()
202202

203-
204203
IF(MSVC)
205204
SET(CMAKE_INSTALL_PREFIX "")
206205
ENDIF()
@@ -254,3 +253,16 @@ ELSE()
254253
SET(CPACK_SOURCE_GENERATOR "TGZ")
255254
ENDIF()
256255
INCLUDE(CPack)
256+
257+
MESSAGE(STATUS "MariaDB Connector/c configuration:")
258+
MESSAGE(STATUS "CPack generation: ${CPACK_GENERATOR}")
259+
IF(CLIENT_DOCS)
260+
MESSAGE(STATUS "Documentation included from ${CLIENT_DOCS}")
261+
ENDIF()
262+
MESSAGE(STATUS "SSL support: ${WITH_OPENSSL}")
263+
MESSAGE(STATUS "Experimental Sqlite support: ${WITH_SQLITE}")
264+
IF(WITH_EXTERNAL_ZLIB)
265+
MESSAGE(STATUS "Zlib support: ${WITH_EXTERNAL_ZLIB}")
266+
ELSE()
267+
MESSAGE(STATUS "Zlib support: yes (using bundled zlib)")
268+
ENDIF()

unittest/libmariadb/ssl.c.in

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -600,7 +600,6 @@ int main(int argc, char **argv)
600600
if (argc > 1)
601601
get_options(argc, argv);
602602

603-
604603
run_tests(my_tests);
605604

606605
mysql_server_end();

0 commit comments

Comments
 (0)