|
| 1 | +diff --git a/CMakeLists.txt b/CMakeLists.txt |
| 2 | +index 9ccfacb..4e28b38 100644 |
| 3 | +--- a/CMakeLists.txt |
| 4 | ++++ b/CMakeLists.txt |
| 5 | +@@ -219,7 +219,12 @@ INCLUDE(${CC_SOURCE_DIR}/cmake/SearchLibrary.cmake) |
| 6 | + |
| 7 | + # Compression plugins: ZSTD, ZLIB |
| 8 | + |
| 9 | +-INCLUDE(${CC_SOURCE_DIR}/cmake/FindZStd.cmake) |
| 10 | ++if(WITH_ZSTD) |
| 11 | ++ find_package(ZSTD NAMES zstd REQUIRED) |
| 12 | ++ set(ZSTD_LIBRARIES zstd::libzstd) |
| 13 | ++else() |
| 14 | ++ set(ZSTD_FOUND 0) |
| 15 | ++endif() |
| 16 | + |
| 17 | + IF(WITH_EXTERNAL_ZLIB) |
| 18 | + IF(NOT ZLIB_FOUND) |
| 19 | +@@ -250,7 +255,7 @@ IF(UNIX) |
| 20 | + SEARCH_LIBRARY(LIBNSL gethostbyname_r "nsl_r;nsl") |
| 21 | + SEARCH_LIBRARY(LIBSOCKET setsockopt socket) |
| 22 | + FIND_PACKAGE(Threads) |
| 23 | +- SET(CMAKE_REQUIRED_LIBRARIES ${CMAKE_REQUIRED_LIBRARIES} ${LIBNSL} ${LIBBIND} ${LIBICONV} ${ZLIB_LIBRARY} |
| 24 | ++ SET(CMAKE_REQUIRED_LIBRARIES ${CMAKE_REQUIRED_LIBRARIES} ${LIBNSL} ${LIBBIND} ${LIBICONV} ${ZLIB_LIBRARIES} |
| 25 | + ${LIBSOCKET} ${CMAKE_DL_LIBS} ${LIBM} ${LIBPTHREAD}) |
| 26 | + SET(SYSTEM_LIBS ${SYSTEM_LIBS} ${LIBNSL} ${LIBBIND} ${LIBICONV} |
| 27 | + ${LIBSOCKET} ${CMAKE_DL_LIBS} ${LIBM} ${LIBPTHREAD}) |
| 28 | +@@ -307,7 +312,7 @@ IF(NOT WITH_SSL STREQUAL "OFF") |
| 29 | + ADD_DEFINITIONS(-DHAVE_OPENSSL -DHAVE_TLS) |
| 30 | + SET(SSL_SOURCES "${CC_SOURCE_DIR}/libmariadb/secure/openssl.c" |
| 31 | + "${CC_SOURCE_DIR}/libmariadb/secure/openssl_crypt.c") |
| 32 | +- SET(SSL_LIBRARIES ${OPENSSL_SSL_LIBRARY} ${OPENSSL_CRYPTO_LIBRARY}) |
| 33 | ++ SET(SSL_LIBRARIES ${OPENSSL_LIBRARIES}) |
| 34 | + IF(WIN32 AND EXISTS ${OPENSSL_INCLUDE_DIR}/openssl/applink.c) |
| 35 | + SET(HAVE_OPENSSL_APPLINK_C 1) |
| 36 | + ENDIF() |
| 37 | +@@ -371,7 +376,12 @@ ENDIF() |
| 38 | + |
| 39 | + IF(WITH_ICONV) |
| 40 | + IF(NOT WIN32) |
| 41 | +- INCLUDE(${CC_SOURCE_DIR}/cmake/FindIconv.cmake) |
| 42 | ++ find_package(Iconv REQUIRED) |
| 43 | ++ include_directories(${Iconv_INCLUDE_DIRS}) |
| 44 | ++ set(ICONV_LIBRARIES "${Iconv_LIBRARIES}") |
| 45 | ++ if(NOT Iconv_IS_BUILT_IN) |
| 46 | ++ set(ICONV_EXTERNAL 1) |
| 47 | ++ endif() |
| 48 | + ENDIF() |
| 49 | + ENDIF() |
| 50 | + |
| 51 | +@@ -431,7 +441,7 @@ ENDIF() |
| 52 | + INCLUDE(${CC_SOURCE_DIR}/plugins/CMakeLists.txt) |
| 53 | + ADD_SUBDIRECTORY(include) |
| 54 | + ADD_SUBDIRECTORY(libmariadb) |
| 55 | +-IF((NOT WIN32) OR CYGWIN) |
| 56 | ++IF(1) |
| 57 | + ADD_SUBDIRECTORY(mariadb_config) |
| 58 | + ENDIF() |
| 59 | + |
| 60 | +diff --git a/libmariadb/CMakeLists.txt b/libmariadb/CMakeLists.txt |
| 61 | +index 852be8d..61ad0a6 100644 |
| 62 | +--- a/libmariadb/CMakeLists.txt |
| 63 | ++++ b/libmariadb/CMakeLists.txt |
| 64 | +@@ -293,7 +293,7 @@ SET(MARIADB_NONBLOCK_SYMBOLS |
| 65 | + |
| 66 | + # handle static plugins |
| 67 | + SET(LIBMARIADB_SOURCES ${LIBMARIADB_SOURCES} ${LIBMARIADB_PLUGIN_SOURCES}) |
| 68 | +-SET(SYSTEM_LIBS ${SYSTEM_LIBS} ${LIBMARIADB_PLUGIN_LIBS} ${ZSTD_LIBRARY} ${ZLIB_LIBRARY}) |
| 69 | ++SET(SYSTEM_LIBS ${SYSTEM_LIBS} ${LIBMARIADB_PLUGIN_LIBS} ${ZSTD_LIBRARIES} ${ZLIB_LIBRARIES}) |
| 70 | + MESSAGE(STATUS "SYSTEM_LIBS: ${SYSTEM_LIBS}") |
| 71 | + INCLUDE_DIRECTORIES(${LIBMARIADB_PLUGIN_INCLUDES}) |
| 72 | + ADD_DEFINITIONS(${LIBMARIADB_PLUGIN_DEFS}) |
| 73 | +diff --git a/mariadb_config/CMakeLists.txt b/mariadb_config/CMakeLists.txt |
| 74 | +index 4cb0ba9..c15838a 100644 |
| 75 | +--- a/mariadb_config/CMakeLists.txt |
| 76 | ++++ b/mariadb_config/CMakeLists.txt |
| 77 | +@@ -30,6 +30,22 @@ IF(${rllength} GREATER 0) |
| 78 | + LIST(REMOVE_DUPLICATES SYSTEM_LIBS) |
| 79 | + ENDIF() |
| 80 | + |
| 81 | ++set(REQUIRES_PRIVATE "" CACHE STRING "") |
| 82 | ++list(REMOVE_ITEM SYSTEM_LIBS ${ZLIB_LIBRARIES}) |
| 83 | ++string(APPEND REQUIRES_PRIVATE " zlib") |
| 84 | ++if(LIBM) |
| 85 | ++ list(REMOVE_ITEM SYSTEM_LIBS ${LIBM}) |
| 86 | ++ list(APPEND SYSTEM_LIBS "m") |
| 87 | ++endif() |
| 88 | ++if(WITH_SSL STREQUAL "OPENSSL") |
| 89 | ++ list(REMOVE_ITEM SYSTEM_LIBS ${SSL_LIBRARIES}) |
| 90 | ++ string(APPEND REQUIRES_PRIVATE " openssl") |
| 91 | ++endif() |
| 92 | ++if(WITH_ZSTD) |
| 93 | ++ list(REMOVE_ITEM SYSTEM_LIBS ${ZSTD_LIBRARIES}) |
| 94 | ++ string(APPEND REQUIRES_PRIVATE " libzstd") |
| 95 | ++endif() |
| 96 | ++ |
| 97 | + FOREACH (LIB_NAME ${SYSTEM_LIBS}) |
| 98 | + GET_LIB_NAME(${LIB_NAME} LIB_OUT) |
| 99 | + SET(extra_dynamic_LDFLAGS "${extra_dynamic_LDFLAGS} ${LIB_OUT}") |
| 100 | +diff --git a/mariadb_config/libmariadb.pc.in b/mariadb_config/libmariadb.pc.in |
| 101 | +index 968181a..3f0410d 100644 |
| 102 | +--- a/mariadb_config/libmariadb.pc.in |
| 103 | ++++ b/mariadb_config/libmariadb.pc.in |
| 104 | +@@ -16,5 +16,6 @@ Description: MariaDB Connector/C dynamic library |
| 105 | + Cflags: -I${includedir} |
| 106 | + Libs: -L${libdir} -lmariadb |
| 107 | + Libs.private: @extra_dynamic_LDFLAGS@ |
| 108 | ++Requires.private: @REQUIRES_PRIVATE@ |
| 109 | + |
| 110 | + |
0 commit comments