From dbad5ac403372a1e445b9282764a323f654b2c0f Mon Sep 17 00:00:00 2001 From: Mark Liversedge Date: Sat, 26 Mar 2016 09:55:38 +0000 Subject: [PATCH] Shadow Build Support The following will always be located in the source directories so we can find them across the different trees: * ../lib/libqwt.a * ../kqoauth/libkqoauth.a (linux only) * ./Resources The references are made via $${PWD} which is the directory for the currently processed .pro file. --- qwt/src/src.pro | 2 +- src/src.pro | 14 +++++++------- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/qwt/src/src.pro b/qwt/src/src.pro index 3824deb07..d11693564 100644 --- a/qwt/src/src.pro +++ b/qwt/src/src.pro @@ -19,7 +19,7 @@ QWT_OUT_ROOT = $${OUT_PWD}/.. TEMPLATE = lib TARGET = $$qwtLibraryTarget(qwt) -DESTDIR = $${QWT_OUT_ROOT}/lib +DESTDIR = $${PWD}/../lib contains(QWT_CONFIG, QwtDll) { diff --git a/src/src.pro b/src/src.pro index 42d276249..735278a33 100644 --- a/src/src.pro +++ b/src/src.pro @@ -92,15 +92,15 @@ win32 { #QWT is configured to build 2 libs (release/debug) on win32 (see qwtbuild.pri) CONFIG(release, debug|release){ - LIBS += -L../qwt/lib -lqwt + LIBS += -L$${PWD}/../qwt/lib -lqwt } CONFIG(debug, debug|release) { - LIBS += -L../qwt/lib -lqwtd + LIBS += -L$${PWD}/../qwt/lib -lqwtd } } else { #QWT is configured to build 1 lib for all other OS (see qwtbuild.pri) - LIBS += -L../qwt/lib -lqwt + LIBS += -L$${PWD}/../qwt/lib -lqwt } # compress and math libs must be defined in gcconfig.pri @@ -192,7 +192,7 @@ isEmpty(QMAKE_LRELEASE) { } # how to run lrelease -isEmpty(TS_DIR):TS_DIR = Resources/translations +isEmpty(TS_DIR):TS_DIR = $${PWD}/Resources/translations TSQM.name = lrelease ${QMAKE_FILE_IN} TSQM.input = TRANSLATIONS TSQM.output = $$TS_DIR/${QMAKE_FILE_BASE}.qm @@ -205,7 +205,7 @@ QMAKE_EXTRA_COMPILERS += TSQM ### RESOURCES ###========== -RESOURCES = Resources/application.qrc Resources/RideWindow.qrc +RESOURCES = $${PWD}/Resources/application.qrc $${PWD}/Resources/RideWindow.qrc @@ -227,8 +227,8 @@ unix:!macx { # build from version in repo for Linux builds since # kqoauth is not packaged for the Debian and this makes # life much easier for the package maintainer - INCLUDEPATH += ../kqoauth - LIBS += ../kqoauth/libkqoauth.a + INCLUDEPATH += $${PWD}/../kqoauth + LIBS += $${PWD}/../kqoauth/libkqoauth.a DEFINES += GC_HAVE_KQOAUTH } else {