0
0
mirror of https://github.com/fralx/LimeReport.git synced 2024-12-25 00:54:39 +03:00

$$QMAKE_COPY --> $$QMAKE_COPY_DIR

This commit is contained in:
Arin Alex 2016-04-02 03:43:52 +03:00
parent 2a16d10df2
commit 2b0e211bc9

View File

@ -28,7 +28,7 @@ RESOURCES += \
EXTRA_DIR += $$PWD/demo_reports EXTRA_DIR += $$PWD/demo_reports
DEST_DIR = $${BUILD_DIR}/$${BUILD_TYPE}/demo DEST_DIR = $${BUILD_DIR}/$${BUILD_TYPE}/demo
REPORTS_DIR = $${DEST_DIR}/demo_reports REPORTS_DIR = $${DEST_DIR}
unix:{ unix:{
LIBS += -L$${BUILD_DIR}/$${BUILD_TYPE}/lib -llimereport LIBS += -L$${BUILD_DIR}/$${BUILD_TYPE}/lib -llimereport
@ -36,7 +36,7 @@ unix:{
LIBS += -L$${BUILD_DIR}/$${BUILD_TYPE}/lib -lQtZint LIBS += -L$${BUILD_DIR}/$${BUILD_TYPE}/lib -lQtZint
} }
DESTDIR = $$DEST_DIR DESTDIR = $$DEST_DIR
QMAKE_POST_LINK += mkdir -p $$quote($$REPORTS_DIR) | $$QMAKE_COPY $$quote($$EXTRA_DIR)/* $$quote($$REPORTS_DIR) $$escape_expand(\n\t) QMAKE_POST_LINK += mkdir -p $$quote($$REPORTS_DIR) | $$QMAKE_COPY_DIR $$quote($$EXTRA_DIR) $$quote($$REPORTS_DIR) $$escape_expand(\n\t)
linux{ linux{
#Link share lib to ../lib rpath #Link share lib to ../lib rpath
QMAKE_LFLAGS += -Wl,--rpath=\\\$\$ORIGIN QMAKE_LFLAGS += -Wl,--rpath=\\\$\$ORIGIN