blob: 582dac9355ebbdc77da0317e407fa7a3d1646dac (
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
32
33
34
35
36
37
38
|
From ef17546b4c93fdc922db5655586149af8137e99c Mon Sep 17 00:00:00 2001
From: Martchus <martchus@gmx.net>
Date: Sun, 8 Nov 2020 00:33:12 +0100
Subject: [PATCH 06/13] 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: I8f9ba27e638619dba411ad0e37f2f03eab4775bf
---
cmake/FindMySQL.cmake | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/cmake/FindMySQL.cmake b/cmake/FindMySQL.cmake
index b61d0107f2..6fb26e51f1 100644
--- a/cmake/FindMySQL.cmake
+++ b/cmake/FindMySQL.cmake
@@ -63,13 +63,13 @@ find_path(MySQL_INCLUDE_DIR
find_library(MySQL_LIBRARY
NO_PACKAGE_ROOT_PATH
- NAMES libmysql mysql mysqlclient libmariadb mariadb
+ NAMES libmariadb mariadb mariadbclient libmysql mysql mysqlclient
HINTS ${MySQL_library_hints})
if(MySQL_library_hints_debug)
find_library(MySQL_LIBRARY_DEBUG
NO_PACKAGE_ROOT_PATH
- NAMES libmysql mysql mysqlclient libmariadb mariadb
+ NAMES libmariadb mariadb mariadbclient libmysql mysql mysqlclient
HINTS ${MySQL_library_hints_debug})
endif()
--
2.43.0
|