mirror of
https://github.com/python-LimeReport/LimeReport.git
synced 2024-12-24 12:34:39 +03:00
Merge pull request #24 from newsages/master
DEST_INCLUDE_DIR = $$PWD/include/ to DEST_INCLUDE_DIR = $$PWD/include
This commit is contained in:
commit
7a4fd7edde
@ -11,7 +11,7 @@ CONFIG(release, debug|release){
|
|||||||
}
|
}
|
||||||
|
|
||||||
BUILD_DIR = $$PWD/build/$${QT_VERSION}
|
BUILD_DIR = $$PWD/build/$${QT_VERSION}
|
||||||
DEST_INCLUDE_DIR = $$PWD/include/
|
DEST_INCLUDE_DIR = $$PWD/include
|
||||||
|
|
||||||
unix:!macx {
|
unix:!macx {
|
||||||
ARCH_DIR = $${OUT_PWD}/unix
|
ARCH_DIR = $${OUT_PWD}/unix
|
||||||
|
@ -26,7 +26,7 @@ DEPENDPATH += $$PWD/../include
|
|||||||
RESOURCES += \
|
RESOURCES += \
|
||||||
r1.qrc
|
r1.qrc
|
||||||
|
|
||||||
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}/demo_reports
|
||||||
|
|
||||||
@ -36,8 +36,8 @@ 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_DIR $$quote($$EXTRA_DIR) $$quote($$REPORTS_DIR) $$escape_expand(\n\t)
|
QMAKE_POST_LINK += mkdir -p $$quote($$REPORTS_DIR) | $$QMAKE_COPY $$quote($$EXTRA_DIR)/* $$quote($$REPORTS_DIR) $$escape_expand(\n\t)
|
||||||
!macx{
|
linux{
|
||||||
#Link share lib to ../lib rpath
|
#Link share lib to ../lib rpath
|
||||||
QMAKE_LFLAGS += -Wl,--rpath=\\\$\$ORIGIN
|
QMAKE_LFLAGS += -Wl,--rpath=\\\$\$ORIGIN
|
||||||
QMAKE_LFLAGS += -Wl,--rpath=\\\$\$ORIGIN/lib
|
QMAKE_LFLAGS += -Wl,--rpath=\\\$\$ORIGIN/lib
|
||||||
|
@ -25,15 +25,22 @@ EXTRA_FILES += \
|
|||||||
|
|
||||||
include(limereport.pri)
|
include(limereport.pri)
|
||||||
|
|
||||||
unix {
|
unix:{
|
||||||
DESTDIR = $${BUILD_DIR}/$${BUILD_TYPE}/lib
|
DESTDIR = $${BUILD_DIR}/$${BUILD_TYPE}/lib
|
||||||
|
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){
|
||||||
|
QMAKE_POST_LINK += $$QMAKE_COPY $$quote($$FILE) $$quote($${DEST_INCLUDE_DIR}) $$escape_expand(\\n\\t) # inside of libs make /include/files
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
|
macx{
|
||||||
for(FILE,EXTRA_FILES){
|
for(FILE,EXTRA_FILES){
|
||||||
QMAKE_POST_LINK += $$QMAKE_COPY $$quote($$FILE) $$quote($${DEST_INCLUDE_DIR}) $$escape_expand(\\n\\t)
|
QMAKE_POST_LINK += $$QMAKE_COPY $$quote($$FILE) $$quote($${DEST_INCLUDE_DIR}) $$escape_expand(\\n\\t)
|
||||||
}
|
}
|
||||||
macx{
|
|
||||||
QMAKE_POST_LINK += mkdir -p $$quote($${DESTDIR}/include) $$escape_expand(\\n\\t)
|
QMAKE_POST_LINK += mkdir -p $$quote($${DESTDIR}/include) $$escape_expand(\\n\\t)
|
||||||
}
|
}
|
||||||
QMAKE_POST_LINK += $(COPY_DIR) $$quote($${DEST_INCLUDE_DIR}*) $$quote($${DESTDIR}/include/)
|
QMAKE_POST_LINK += $(COPY_DIR) $$quote($${DEST_INCLUDE_DIR}*) $$quote($${DESTDIR}/include)
|
||||||
}
|
}
|
||||||
|
|
||||||
win32 {
|
win32 {
|
||||||
|
Loading…
Reference in New Issue
Block a user