From 221110454e5bc8c357928148a7d7378c396a1328 Mon Sep 17 00:00:00 2001 From: proller Date: Tue, 29 Aug 2017 20:13:20 +0300 Subject: [PATCH] Prefer mariadbclient --- debian/control | 2 +- libs/libmysqlxx/cmake/find_mysqlclient.cmake | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/debian/control b/debian/control index a91d321d09d..2132f64a025 100644 --- a/debian/control +++ b/debian/control @@ -4,7 +4,7 @@ Maintainer: Alexey Milovidov 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, diff --git a/libs/libmysqlxx/cmake/find_mysqlclient.cmake b/libs/libmysqlxx/cmake/find_mysqlclient.cmake index ae77349e444..1e6d6decbb6 100644 --- 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))