Prefer mariadbclient

22111045 · proller · alexey-milovidov · 8d7937cc · 22111045 · 22111045
隐藏空白更改
内联并排

Showing with 3 addition and 3 deletion

debian/control debian/control +1 -1

libs/libmysqlxx/cmake/find_mysqlclient.cmake libs/libmysqlxx/cmake/find_mysqlclient.cmake +2 -2

未找到文件。
--- a/debian/control
+++ b/debian/control
@@ -4,7 +4,7 @@ Maintainer: Alexey Milovidov <milovidov@yandex-team.ru>
 Build-Depends: debhelper (>= 9),
               cmake,
               gcc-6, g++-6,
-               default-libmysqlclient-dev | libmysqlclient-dev,
+               libmariadbclient-dev | default-libmysqlclient-dev | libmysqlclient-dev,
               libicu-dev,
               libltdl-dev,
               libreadline-dev,

--- a/libs/libmysqlxx/cmake/find_mysqlclient.cmake
+++ b/libs/libmysqlxx/cmake/find_mysqlclient.cmake
@@ -22,9 +22,9 @@ if (ENABLE_MYSQL)
    find_path (MYSQL_INCLUDE_DIR NAMES mysql/mysql.h PATHS ${MYSQL_INCLUDE_PATHS})

    if (USE_STATIC_LIBRARIES)
-        find_library (STATIC_MYSQLCLIENT_LIB libmysqlclient.a PATHS ${MYSQL_LIB_PATHS})
+        find_library (STATIC_MYSQLCLIENT_LIB mariadbclient mysqlclient PATHS ${MYSQL_LIB_PATHS})
    else ()
-        find_library (MYSQLCLIENT_LIB mysqlclient PATHS ${MYSQL_LIB_PATHS})
+        find_library (MYSQLCLIENT_LIB mariadbclient mysqlclient PATHS ${MYSQL_LIB_PATHS})
    endif ()

    if (MYSQL_INCLUDE_DIR AND (STATIC_MYSQLCLIENT_LIB OR MYSQLCLIENT_LIB))