[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    kdesupport/qca
From:       Justin Karneges <infiniti () affinix ! com>
Date:       2008-06-03 0:48:53
Message-ID: 1212454133.256502.24936.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 815999 by infiniti:

ability to link against qca as a framework, and also use the tree lib 
or the install lib as appropriate


 M  +32 -6     crypto.prf.in  


--- trunk/kdesupport/qca/crypto.prf.in #815998:815999
@@ -1,12 +1,38 @@
 # prepend this file with QCA_INCDIR/QCA_LIBDIR definitions
 
+# NOTE: any changes made to this file need to be tracked in qcm/qca.qcm
+
 CONFIG *= qt
-INCLUDEPATH += $$QCA_INCDIR/QtCrypto
-LIBS += -L$$QCA_LIBDIR
 
-LINKAGE = -lqca
-CONFIG(debug, debug|release) {
-	windows:LINKAGE = -lqcad
-	mac:LINKAGE = -lqca_debug
+# if we are including crypto.prf from the qca tree (and not utilizing it as
+# an installed qmake CONFIG feature), then point to the tree.  this allows our
+# qca tree apps to build before qca itself is installed.
+exists($$PWD/qca.pro) {
+	QCA_INCDIR = $$PWD/include
+	QCA_LIBDIR = $$PWD/lib
 }
+
+LINKAGE =
+
+# on mac, if qca was built as a framework, link against it
+mac: {
+	framework_dir = $$QCA_LIBDIR
+	exists($$framework_dir/qca.framework) {
+		QMAKE_FRAMEWORKPATH *= $$framework_dir
+		INCLUDEPATH += $$framework_dir/qca.framework/Headers
+		LINKAGE = -framework qca
+	}
+}
+
+# else, link normally
+isEmpty(LINKAGE) {
+	INCLUDEPATH += $$QCA_INCDIR/QtCrypto
+	LIBS += -L$$QCA_LIBDIR
+	LINKAGE = -lqca
+	CONFIG(debug, debug|release) {
+		windows:LINKAGE = -lqcad
+		mac:LINKAGE = -lqca_debug
+	}
+}
+
 LIBS += $$LINKAGE
[prev in list] [next in list] [prev in thread] [next in thread]