Martchus
defbb48223
* Make it possible to use shared and static Qt build (installed in the same prefix) at the same time in a project. * This allows compiling shared and static libraries depending on Qt in one step. * Static CMake modules are prefixed with 'Static', eg. 'StaticQt5Core' and provide importet targets as eg. 'Qt5::static::Core'.
26 lines
729 B
Diff
26 lines
729 B
Diff
From 69a3150b2a84984cc37e59e253c17fe88f5fa51e Mon Sep 17 00:00:00 2001
|
|
From: Martchus <martchus@gmx.net>
|
|
Date: Sun, 18 Sep 2016 18:56:55 +0200
|
|
Subject: [PATCH 24/25] Use shared/static version of MariaDB
|
|
|
|
---
|
|
config.tests/unix/mysql/mysql.pro | 6 +++++-
|
|
1 file changed, 5 insertions(+), 1 deletion(-)
|
|
|
|
diff --git a/config.tests/unix/mysql/mysql.pro b/config.tests/unix/mysql/mysql.pro
|
|
index 06d1880..5dadbfb 100644
|
|
--- a/config.tests/unix/mysql/mysql.pro
|
|
+++ b/config.tests/unix/mysql/mysql.pro
|
|
@@ -1,3 +1,7 @@
|
|
SOURCES = mysql.cpp
|
|
CONFIG -= qt dylib
|
|
-LIBS += -lmysqlclient
|
|
+contains(CONFIG, static) {
|
|
+ LIBS += -lmariadbclient -lws2_32 -lpthread -lz -lm -lssl -lcrypto
|
|
+} else {
|
|
+ LIBS += -lmariadbclient
|
|
+}
|
|
--
|
|
2.10.1
|
|
|