mirrors/LimeReport
0
0
Fork 0
mirror of https://github.com/fralx/LimeReport.git synced 2024-12-23 16:22:58 +03:00
Code

simplify DEST_BINS, DEST_LIBS

Browse Source
This commit is contained in:
newsages 2016-04-03 15:33:41 +02:00
parent 12824cee9a
commit abea99bd3f
5 changed files with 19 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
3rdparty/zint-2.4.4/backend_qt4/Zint.pro vendored
View File

@ -95,7 +95,7 @@ SOURCES += \
$$PWD/../backend/upcean.c
DESTDIR = $${BUILD_DIR}/$${ARCH_TYPE}/$${BUILD_TYPE}/lib
DESTDIR = $${DEST_LIBS}
DLLDESTDIR = $${DESTDIR}
unix {
target.path = $${DESTDIR}

4
common.pri
View File

@ -12,7 +12,6 @@ CONFIG(release, debug|release){
BUILD_DIR = $$PWD/build/$${QT_VERSION}
DEST_INCLUDE_DIR = $$PWD/include
unix{
ARCH_DIR = $${OUT_PWD}/unix
ARCH_TYPE = unix
@ -37,6 +36,9 @@ win32 {
ARCH_TYPE = win32
}
DEST_LIBS = $${BUILD_DIR}/$${ARCH_TYPE}/$${BUILD_TYPE}/lib
DEST_BINS = $${BUILD_DIR}/$${ARCH_TYPE}/$${BUILD_TYPE}/$${TARGET}
MOC_DIR = $${ARCH_DIR}/$${BUILD_TYPE}/moc
UI_DIR = $${ARCH_DIR}/$${BUILD_TYPE}/ui
UI_HEADERS_DIR = $${ARCH_DIR}/$${BUILD_TYPE}/ui

12
demo_r1/demo_r1.pro
View File

@ -1,7 +1,7 @@
include(../common.pri)
QT += core gui
TARGET = LRDemo
TARGET = LRDemo_r1
TEMPLATE = app
SOURCES += main.cpp\
@ -18,7 +18,7 @@ RESOURCES += \
r1.qrc
EXTRA_DIR += $$PWD/demo_reports
DEST_DIR = $${BUILD_DIR}/$${ARCH_TYPE}/$${BUILD_TYPE}/demo_r1
DEST_DIR = $${DEST_BINS}
REPORTS_DIR = $${DEST_DIR}
macx{
@ -26,9 +26,9 @@ macx{
}
unix:{
LIBS += -L$${BUILD_DIR}/$${ARCH_TYPE}/$${BUILD_TYPE}/lib -llimereport
LIBS += -L$${DEST_LIBS} -llimereport
contains(CONFIG,zint){
LIBS += -L$${BUILD_DIR}/$${ARCH_TYPE}/$${BUILD_TYPE}/lib -lQtZint
LIBS += -L$${DEST_LIBS} -lQtZint
}
DESTDIR = $$DEST_DIR
# QMAKE_POST_LINK += mkdir -p $$quote($$REPORTS_DIR) |
@ -54,9 +54,9 @@ win32 {
QMAKE_POST_LINK += $$QMAKE_COPY_DIR $$quote($$EXTRA_DIR\\*) $$quote($$REPORTS_DIR\\demo_reports) $$escape_expand(\\n\\t)
contains(CONFIG,zint){
LIBS += -L$${BUILD_DIR}/$${ARCH_TYPE}/$${BUILD_TYPE}/lib -lQtZint
LIBS += -L$${DEST_LIBS} -lQtZint
}
LIBS += -L$${BUILD_DIR}/$${ARCH_TYPE}/$${BUILD_TYPE}/lib -llimereport
LIBS += -L$${DEST_LIBS} -llimereport
}

13
demo_r2/demo_r2.pro
View File

@ -1,7 +1,7 @@
include(../common.pri)
QT += core gui
TARGET = LRDemo
TARGET = LRDemo_r2
TEMPLATE = app
SOURCES += main.cpp\
@ -18,7 +18,7 @@ RESOURCES += \
demo_r2.qrc
EXTRA_DIR += $$PWD/demo_reports
DEST_DIR = $${BUILD_DIR}/$${ARCH_TYPE}/$${BUILD_TYPE}/demo_r2
DEST_DIR = $${DEST_BINS}
REPORTS_DIR = $${DEST_DIR}
macx{
@ -26,9 +26,9 @@ macx{
}
unix:{
LIBS += -L$${BUILD_DIR}/$${ARCH_TYPE}/$${BUILD_TYPE}/lib -llimereport
LIBS += -L$${DEST_LIBS} -llimereport
contains(CONFIG,zint){
LIBS += -L$${BUILD_DIR}/$${ARCH_TYPE}/$${BUILD_TYPE}/lib -lQtZint
LIBS += -L$${DEST_LIBS} -lQtZint
}
DESTDIR = $$DEST_DIR
# QMAKE_POST_LINK += mkdir -p $$quote($$REPORTS_DIR) |
@ -54,9 +54,8 @@ win32 {
QMAKE_POST_LINK += $$QMAKE_COPY_DIR $$quote($$EXTRA_DIR\\*) $$quote($$REPORTS_DIR\\demo_reports) $$escape_expand(\\n\\t)
contains(CONFIG,zint){
LIBS += -L$${BUILD_DIR}/$${ARCH_TYPE}/$${BUILD_TYPE}/lib -lQtZint
LIBS += -L$${DEST_LIBS} -lQtZint
}
LIBS += -L$${BUILD_DIR}/$${ARCH_TYPE}/$${BUILD_TYPE}/lib -llimereport
LIBS += -L$${DEST_LIBS} -llimereport
}

6
limereport/limereport.pro
View File

@ -26,7 +26,7 @@ EXTRA_FILES += \
include(limereport.pri)
unix:{
DESTDIR = $${BUILD_DIR}/$${ARCH_TYPE}/$${BUILD_TYPE}/lib
DESTDIR = $${DEST_LIBS}
linux{
QMAKE_POST_LINK += mkdir -p $$quote($${DEST_INCLUDE_DIR}) $$escape_expand(\\n\\t) # qmake need make mkdir -p on subdirs more than root/
for(FILE,EXTRA_FILES){
@ -45,7 +45,7 @@ unix:{
win32 {
EXTRA_FILES ~= s,/,\\,g
BUILD_DIR ~= s,/,\\,g
DESTDIR = $${BUILD_DIR}/$${BUILD_TYPE}/lib
DESTDIR = $${DEST_LIBS}
DEST_DIR = $$DESTDIR/include
DEST_DIR ~= s,/,\\,g
DEST_INCLUDE_DIR ~= s,/,\\,g
@ -60,7 +60,7 @@ contains(CONFIG,zint){
message(zint)
INCLUDEPATH += $$ZINT_PATH/backend $$ZINT_PATH/backend_qt4
DEPENDPATH += $$ZINT_PATH/backend $$ZINT_PATH/backend_qt4
LIBS += -L$${DESTDIR} -lQtZint
LIBS += -L$${DEST_LIBS} -lQtZint
}
#######