From 9e287b50ee77d7a9a52483e86954d0eb2f5760df Mon Sep 17 00:00:00 2001 From: Li Xinwei <1326710505@qq.com> Date: Wed, 6 Jan 2021 01:02:47 +0800 Subject: [PATCH] CMake: improve FindMySQL.cmake On Windows, Qt should libmysql.lib instead of mysqlclient.lib. Add support for mariadb. Re-indent FindMySQL.cmake. Fixes: QTBUG-88661 Fixes: QTBUG-89775 Change-Id: I6bdf195b8976c59230a12af335a838af55df0caf Reviewed-by: Alexey Edelev Reviewed-by: Joerg Bornemann (cherry picked from commit 0c7042defaf3a2a97aebc6f652b4d34229093a5a) Reviewed-by: Qt Cherry-pick Bot --- cmake/FindMySQL.cmake | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/cmake/FindMySQL.cmake b/cmake/FindMySQL.cmake index 54c94b8a2f0..f6c77d2be1a 100644 --- a/cmake/FindMySQL.cmake +++ b/cmake/FindMySQL.cmake @@ -24,27 +24,26 @@ pkg_check_modules(PC_MySQL QUIET mysqlclient) find_path(MySQL_INCLUDE_DIRS NAMES mysql.h HINTS ${PC_MySQL_INCLUDEDIR} - PATH_SUFFIXES mysql) + PATH_SUFFIXES mysql mariadb) find_library(MySQL_LIBRARIES - NAMES mysqlclient - HINTS ${PC_MySQL_LIBDIR} -) + NAMES libmysql mysql mysqlclient libmariadb mariadb + HINTS ${PC_MySQL_LIBDIR}) include(FindPackageHandleStandardArgs) find_package_handle_standard_args(MySQL DEFAULT_MSG MySQL_LIBRARIES MySQL_INCLUDE_DIRS) if(MySQL_FOUND AND NOT TARGET MySQL::MySQL) - add_library(MySQL::MySQL UNKNOWN IMPORTED) - set_target_properties(MySQL::MySQL PROPERTIES - IMPORTED_LOCATION "${MySQL_LIBRARIES}" - INTERFACE_INCLUDE_DIRECTORIES "${MySQL_INCLUDE_DIRS}") + add_library(MySQL::MySQL UNKNOWN IMPORTED) + set_target_properties(MySQL::MySQL PROPERTIES + IMPORTED_LOCATION "${MySQL_LIBRARIES}" + INTERFACE_INCLUDE_DIRECTORIES "${MySQL_INCLUDE_DIRS}") endif() mark_as_advanced(MySQL_INCLUDE_DIRS MySQL_LIBRARIES) include(FeatureSummary) set_package_properties(MySQL PROPERTIES - URL "https://www.mysql.com" - DESCRIPTION "MySQL client library") + URL "https://www.mysql.com" + DESCRIPTION "MySQL client library")