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'.
22 lines
580 B
Diff
22 lines
580 B
Diff
From 3c7458eaa2d7fb3bb9ca379eec96418e1c6ba482 Mon Sep 17 00:00:00 2001
|
|
From: Mark Brand <mabrand@mabrand.nl>
|
|
Date: Mon, 8 Dec 2014 14:15:12 +0100
|
|
Subject: [PATCH 02/25] Fix oci config test on windows
|
|
|
|
---
|
|
config.tests/unix/oci/oci.pro | 2 +-
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
|
diff --git a/config.tests/unix/oci/oci.pro b/config.tests/unix/oci/oci.pro
|
|
index 3ffda1d..39b6f3759 100644
|
|
--- a/config.tests/unix/oci/oci.pro
|
|
+++ b/config.tests/unix/oci/oci.pro
|
|
@@ -1,3 +1,3 @@
|
|
SOURCES = oci.cpp
|
|
CONFIG -= qt dylib
|
|
-LIBS += -lclntsh
|
|
+!win32:LIBS += -lclntsh
|
|
--
|
|
2.10.1
|
|
|