mirrors/LimeReport
0
0
Fork 0
mirror of https://github.com/fralx/LimeReport.git synced 2024-12-24 08:34:38 +03:00
Code

not use end of / on $$VARIABLE_DIR for unix

Browse Source
This commit is contained in:
Newsages 2016-03-31 15:30:00 +02:00
parent 54fe767e16
commit aeb11d0318
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
demo_r1/demo_r1.pro
View File

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

3
limereport/limereport.pro
View File

@ -28,10 +28,11 @@ include(limereport.pri)
unix {
DESTDIR = $${BUILD_DIR}/$${BUILD_TYPE}/lib
linux{
QMAKE_POST_LINK += mkdir -p $$quote($${DESTDIR}/include) $$escape_expand(\\n\\t) # qmake need make mkdir -p on subdirs more than root/
for(FILE,EXTRA_FILES){
QMAKE_POST_LINK += $$QMAKE_COPY $$quote($$FILE) $$quote($${DESTDIR}/include) $$escape_expand(\\n\\t) # inside of libs make /include/files
}
QMAKE_POST_LINK += mkdir -p $$quote($${DESTDIR}/include) $$escape_expand(\\n\\t) # qmake need make mkdir -p on subdirs more than root/
}
macx{
for(FILE,EXTRA_FILES){