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

39 lines
1.4 KiB
Diff
Raw Normal View History

2023-03-31 23:09:26 +02:00
From cef672609c101ed359828c7e4b7762f7f464fa20 Mon Sep 17 00:00:00 2001
From: Martchus <martchus@gmx.net>
Date: Sun, 8 Nov 2020 00:33:12 +0100
Subject: [PATCH 06/12] 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).
2023-03-15 10:48:39 +01:00
Change-Id: I8f9ba27e638619dba411ad0e37f2f03eab4775bf
---
2023-03-15 10:48:39 +01:00
cmake/FindMySQL.cmake | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/cmake/FindMySQL.cmake b/cmake/FindMySQL.cmake
2023-03-31 23:09:26 +02:00
index b61d0107f2..6fb26e51f1 100644
--- 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-04-28 17:11:48 +02:00
find_library(MySQL_LIBRARY
2023-03-15 10:48:39 +01:00
NO_PACKAGE_ROOT_PATH
- 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()
--
2023-03-31 23:09:26 +02:00
2.40.0