PKGBUILDs/qt6-base/mingw-w64/0006-Support-finding-static...

32 lines
1.1 KiB
Diff
Raw Normal View History

2021-06-08 13:12:14 +02:00
From b95bfa5f73b66f31073644a60f04e5740e5a4dec Mon Sep 17 00:00:00 2001
From: Martchus <martchus@gmx.net>
Date: Sun, 8 Nov 2020 00:33:12 +0100
2021-06-08 13:12:14 +02:00
Subject: [PATCH 6/7] 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).
2021-04-28 17:11:48 +02:00
Change-Id: I9559b97540f2f928b4dec990d497bf2911ad5b60
---
cmake/FindMySQL.cmake | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/cmake/FindMySQL.cmake b/cmake/FindMySQL.cmake
2021-04-28 17:11:48 +02:00
index 0fcba2148e..ab4f6fdc9e 100644
--- a/cmake/FindMySQL.cmake
+++ b/cmake/FindMySQL.cmake
2021-04-28 17:11:48 +02:00
@@ -27,7 +27,7 @@ find_path(MySQL_INCLUDE_DIR
PATH_SUFFIXES mysql mariadb)
2021-04-28 17:11:48 +02:00
find_library(MySQL_LIBRARY
- NAMES libmysql mysql mysqlclient libmariadb mariadb
+ NAMES libmariadb mariadb mariadbclient libmysql mysql mysqlclient
HINTS ${PC_MySQL_LIBDIR})
include(FindPackageHandleStandardArgs)
--
2021-06-08 13:12:14 +02:00
2.32.0