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

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

SVN commit 816000 by infiniti:

track changes in crypto.prf


 M  +29 -10    qca.qcm  


--- trunk/kdesupport/qca/qcm/qca.qcm #815999:816000
@@ -9,16 +9,35 @@
 static QString internal_crypto_prf(const QString &incdir, const QString &libdir)
 {
 	QString out = QString(
-	"CONFIG *= qt\n"
-	"INCLUDEPATH += %1/QtCrypto\n"
-	"LIBS += -L%2\n"
-	"\n"
-	"LINKAGE = -lqca\n"
-	"CONFIG(debug, debug|release) {\n"
-        "	windows:LINKAGE = -lqcad\n"
-        "	mac:LINKAGE = -lqca_debug\n"
-	"}\n"
-	"LIBS += $$LINKAGE\n"
+"QCA_INCDIR = %1\n"
+"QCA_LIBDIR = %2\n"
+"\n"
+"CONFIG *= qt\n"
+"\n"
+"LINKAGE =\n"
+"\n"
+"# on mac, if qca was built as a framework, link against it\n"
+"mac: {\n"
+"        framework_dir = $$QCA_LIBDIR\n"
+"        exists($$framework_dir/qca.framework) {\n"
+"                QMAKE_FRAMEWORKPATH *= $$framework_dir\n"
+"                INCLUDEPATH += $$framework_dir/qca.framework/Headers\n"
+"                LINKAGE = -framework qca\n"
+"        }\n"
+"}\n"
+"\n"
+"# else, link normally\n"
+"isEmpty(LINKAGE) {\n"
+"        INCLUDEPATH += $$QCA_INCDIR/QtCrypto\n"
+"        LIBS += -L$$QCA_LIBDIR\n"
+"        LINKAGE = -lqca\n"
+"        CONFIG(debug, debug|release) {\n"
+"                windows:LINKAGE = -lqcad\n"
+"                mac:LINKAGE = -lqca_debug\n"
+"        }\n"
+"}\n"
+"\n"
+"LIBS += $$LINKAGE\n"
 	).arg(incdir, libdir);
 	return out;
 }
[prev in list] [next in list] [prev in thread] [next in thread]