2024-05-21 17:02:41 +02:00
|
|
|
From 0d6f8018db765e3d10137aca8357783d54a7ce33 Mon Sep 17 00:00:00 2001
|
2021-02-04 18:12:25 +01:00
|
|
|
From: Martchus <martchus@gmx.net>
|
|
|
|
Date: Sun, 8 Nov 2020 00:33:12 +0100
|
2024-05-21 17:02:41 +02:00
|
|
|
Subject: [PATCH 06/16] Support finding static MariaDB client library
|
2021-02-04 18:12:25 +01:00
|
|
|
|
|
|
|
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).
|
|
|
|
|
2023-03-15 10:48:39 +01:00
|
|
|
Change-Id: I8f9ba27e638619dba411ad0e37f2f03eab4775bf
|
2021-02-04 18:12:25 +01:00
|
|
|
---
|
2023-03-15 10:48:39 +01:00
|
|
|
cmake/FindMySQL.cmake | 4 ++--
|
|
|
|
1 file changed, 2 insertions(+), 2 deletions(-)
|
2021-02-04 18:12:25 +01:00
|
|
|
|
|
|
|
diff --git a/cmake/FindMySQL.cmake b/cmake/FindMySQL.cmake
|
2024-03-28 12:00:21 +01:00
|
|
|
index b61d0107f25..6fb26e51f13 100644
|
2021-02-04 18:12:25 +01:00
|
|
|
--- a/cmake/FindMySQL.cmake
|
|
|
|
+++ b/cmake/FindMySQL.cmake
|
2023-03-31 23:09:26 +02:00
|
|
|
@@ -63,13 +63,13 @@ find_path(MySQL_INCLUDE_DIR
|
2021-02-04 18:12:25 +01:00
|
|
|
|
2021-04-28 17:11:48 +02:00
|
|
|
find_library(MySQL_LIBRARY
|
2023-03-15 10:48:39 +01:00
|
|
|
NO_PACKAGE_ROOT_PATH
|
2021-02-04 18:12:25 +01:00
|
|
|
- NAMES libmysql mysql mysqlclient libmariadb mariadb
|
|
|
|
+ NAMES libmariadb mariadb mariadbclient libmysql mysql mysqlclient
|
2023-03-15 10:48:39 +01:00
|
|
|
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()
|
2021-02-04 18:12:25 +01:00
|
|
|
|
|
|
|
--
|
2024-05-21 17:02:41 +02:00
|
|
|
2.45.1
|
2021-02-04 18:12:25 +01:00
|
|
|
|