blob: 109b78895bbc649285b299c95a81afcdea53c1ba (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
|
From d0bbc1ae7e19e0622d1015f9d773a0d5d2d891f6 Mon Sep 17 00:00:00 2001
From: Martchus <martchus@gmx.net>
Date: Sun, 8 Nov 2020 00:33:12 +0100
Subject: [PATCH 6/8] Support finding static MariaDB client library
We need to reverse the order to look for mariadb first (and only then
for mysql) because otherwise it would pick up the static library
"libmysqlclient.a" (provided by mingw-w64-mariadb-connector-c during
the shared build (leading to linker errors).
Change-Id: I9559b97540f2f928b4dec990d497bf2911ad5b60
---
cmake/FindMySQL.cmake | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/cmake/FindMySQL.cmake b/cmake/FindMySQL.cmake
index 0fcba2148e..ab4f6fdc9e 100644
--- a/cmake/FindMySQL.cmake
+++ b/cmake/FindMySQL.cmake
@@ -27,7 +27,7 @@ find_path(MySQL_INCLUDE_DIR
PATH_SUFFIXES mysql mariadb)
find_library(MySQL_LIBRARY
- NAMES libmysql mysql mysqlclient libmariadb mariadb
+ NAMES libmariadb mariadb mariadbclient libmysql mysql mysqlclient
HINTS ${PC_MySQL_LIBDIR})
include(FindPackageHandleStandardArgs)
--
2.35.1
|