mirror of
https://github.com/python-LimeReport/LimeReport.git
synced 2024-12-24 12:34:39 +03:00
Fix build on Mac and "/" added to REPORTS_DIR
This commit is contained in:
parent
96653b0920
commit
2679e0ec07
@ -5,7 +5,11 @@ greaterThan(QT_MAJOR_VERSION, 4){
|
|||||||
QT += widgets printsupport
|
QT += widgets printsupport
|
||||||
DEFINES += HAVE_QT5
|
DEFINES += HAVE_QT5
|
||||||
}
|
}
|
||||||
CONFIG -= app_bundle
|
|
||||||
|
macx{
|
||||||
|
CONFIG += app_bundle
|
||||||
|
}
|
||||||
|
|
||||||
TARGET = LRDemo
|
TARGET = LRDemo
|
||||||
TEMPLATE = app
|
TEMPLATE = app
|
||||||
|
|
||||||
@ -23,6 +27,8 @@ RESOURCES += \
|
|||||||
r1.qrc
|
r1.qrc
|
||||||
|
|
||||||
EXTRA_DIR += $$PWD/demo_reports/*
|
EXTRA_DIR += $$PWD/demo_reports/*
|
||||||
|
DEST_DIR = $${BUILD_DIR}/demo/$${BUILD_TYPE}
|
||||||
|
REPORTS_DIR = $${DEST_DIR}/demo_reports/
|
||||||
|
|
||||||
CONFIG(release, debug|release){
|
CONFIG(release, debug|release){
|
||||||
message(Release)
|
message(Release)
|
||||||
@ -32,9 +38,7 @@ CONFIG(release, debug|release){
|
|||||||
BUILD_TYPE = debug
|
BUILD_TYPE = debug
|
||||||
}
|
}
|
||||||
|
|
||||||
unix{
|
unix{
|
||||||
DEST_DIR = $${BUILD_DIR}/demo/$${BUILD_TYPE}
|
|
||||||
REPORTS_DIR = $${DEST_DIR}/demo_reports
|
|
||||||
MOC_DIR = $${OUT_PWD}/moc
|
MOC_DIR = $${OUT_PWD}/moc
|
||||||
UI_DIR = $${OUT_PWD}/ui
|
UI_DIR = $${OUT_PWD}/ui
|
||||||
UI_HEADERS_DIR = $${OUT_PWD}/ui
|
UI_HEADERS_DIR = $${OUT_PWD}/ui
|
||||||
@ -53,9 +57,7 @@ contains(CONFIG,zint){
|
|||||||
|
|
||||||
win32 {
|
win32 {
|
||||||
EXTRA_DIR ~= s,/,\\,g
|
EXTRA_DIR ~= s,/,\\,g
|
||||||
DEST_DIR = $${BUILD_DIR}/demo/$${BUILD_TYPE}
|
DEST_DIR ~= s,/,\\,g
|
||||||
DEST_DIR ~= s,/,\\,g
|
|
||||||
REPORTS_DIR = $${DEST_DIR}/demo_reports
|
|
||||||
REPORTS_DIR ~= s,/,\\,g
|
REPORTS_DIR ~= s,/,\\,g
|
||||||
|
|
||||||
MOC_DIR = $${OUT_PWD}/moc
|
MOC_DIR = $${OUT_PWD}/moc
|
||||||
|
@ -13,7 +13,11 @@ CONFIG += lib
|
|||||||
CONFIG += dll
|
CONFIG += dll
|
||||||
CONFIG += create_prl
|
CONFIG += create_prl
|
||||||
CONFIG += link_prl
|
CONFIG += link_prl
|
||||||
CONFIG -= app_bundle
|
|
||||||
|
macx{
|
||||||
|
CONFIG -= dll
|
||||||
|
CONFIG += lib_bundle
|
||||||
|
}
|
||||||
|
|
||||||
DEFINES += LIMEREPORT_EXPORTS
|
DEFINES += LIMEREPORT_EXPORTS
|
||||||
|
|
||||||
@ -87,6 +91,7 @@ contains(CONFIG,build_translations){
|
|||||||
}
|
}
|
||||||
|
|
||||||
TRANSLATIONS = $$prependAll(LANGUAGES, $$TRANSLATIONS_PATH/limereport_,.ts)
|
TRANSLATIONS = $$prependAll(LANGUAGES, $$TRANSLATIONS_PATH/limereport_,.ts)
|
||||||
|
|
||||||
qtPrepareTool(LUPDATE, lupdate)
|
qtPrepareTool(LUPDATE, lupdate)
|
||||||
ts.commands = $$LUPDATE $$PWD -ts $$TRANSLATIONS
|
ts.commands = $$LUPDATE $$PWD -ts $$TRANSLATIONS
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user