File 0006-Implemented-SYSTEM_QUAZIP_LDFLAGS-fixing-i... of Package merkaartor

Overview Repositories Revisions Requests Users Attributes Meta

File 0006-Implemented-SYSTEM_QUAZIP_LDFLAGS-fixing-issue-66.patch of Package merkaartor (Revision f8c1cf9cd141f8b1d20e9baa5283e12e)

Currently displaying revision f8c1cf9cd141f8b1d20e9baa5283e12e , Show latest

From ba74296b66745a5cdd592e88af2252a22c6b1840 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ladislav=20L=C3=A1ska?= <krakonos@krakonos.org>
Date: Thu, 15 Oct 2015 15:34:56 +0200
Subject: Implemented SYSTEM_QUAZIP_LDFLAGS, fixing issue #66.
Origin: https://github.com/openstreetmap/merkaartor/commit/ba74296b66745a5cdd592e88af2252a22c6b1840
Bug: https://github.com/openstreetmap/merkaartor/issues/66

---
 INSTALL     | 2 ++
 src/src.pro | 6 +++++-
 2 files changed, 7 insertions(+), 1 deletion(-)

--- a/INSTALL
+++ b/INSTALL
@@ -97,6 +97,8 @@ NODEBUG=1                   - release ta
 NOUSEWEBKIT                 - disable use of WebKit (Yahoo adapter)
 SYSTEM_QTSA                 - use system copy of qtsingleapplication instead of internal
 SYSTEM_QUAZIP               - use system copy of quazip instead of internal
+SYSTEM_QUAZIP_LDFLAGS       - custom flags instead of the default "-lquazip", if
+                              your library has different name
 SPATIALITE=1                - compile spatialite backend (not working) and
                               SpatialiteBackground plugin (state unknown). Use
                               at your own risk.
--- a/src/src.pro
+++ b/src/src.pro
@@ -17,7 +17,11 @@ isEmpty(SYSTEM_QUAZIP) {
   DEFINES += QUAZIP_STATIC
   include(../3rdparty/quazip-0.7/quazip.pri)
 } else {
-  LIBS += -lquazip
+  isEmpty(SYSTEM_QUAZIP_LDFLAGS) {
+      LIBS += -lquazip
+  } else {
+      LIBS += $$SYSTEM_QUAZIP_LDFLAGS
+  }
 }
 
 #Qt Version

Places

File 0006-Implemented-SYSTEM_QUAZIP_LDFLAGS-fixing-issue-66.patch of Package merkaartor (Revision f8c1cf9cd141f8b1d20e9baa5283e12e)

Places