mirror of
https://github.com/fralx/LimeReport.git
synced 2024-12-24 00:33:02 +03:00
Build on Linux & Mac fixed
This commit is contained in:
parent
cfd971cd46
commit
6f35c5e2a3
1
3rdparty/zint-2.4.4/backend_qt4/Zint.pro
vendored
1
3rdparty/zint-2.4.4/backend_qt4/Zint.pro
vendored
@ -8,7 +8,6 @@ include(../../../common.pri)
|
||||
macx{
|
||||
CONFIG -= dll
|
||||
CONFIG += lib_bundle
|
||||
CONFIG += plugin
|
||||
}
|
||||
|
||||
unix{
|
||||
|
@ -30,19 +30,20 @@ EXTRA_DIR += $$PWD/demo_reports/*
|
||||
DEST_DIR = $${BUILD_DIR}/$${BUILD_TYPE}/demo
|
||||
REPORTS_DIR = $${DEST_DIR}/demo_reports
|
||||
|
||||
unix{
|
||||
unix:{
|
||||
LIBS += -L$${BUILD_DIR}/$${BUILD_TYPE}/lib -llimereport
|
||||
contains(CONFIG,zint){
|
||||
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{
|
||||
#Link share lib to ../lib rpath
|
||||
QMAKE_LFLAGS += -Wl,--rpath=\\\$\$ORIGIN
|
||||
QMAKE_LFLAGS += -Wl,--rpath=\\\$\$ORIGIN/lib
|
||||
QMAKE_LFLAGS += -Wl,--rpath=\\\$\$ORIGIN/../lib
|
||||
QMAKE_LFLAGS_RPATH += #. .. ./libs
|
||||
|
||||
}
|
||||
target.path = $${DEST_DIR}
|
||||
INSTALLS = target
|
||||
}
|
||||
@ -58,4 +59,3 @@ win32 {
|
||||
QMAKE_POST_LINK += $$QMAKE_COPY_DIR $$quote($$EXTRA_DIR) $$quote($$REPORTS_DIR) $$escape_expand(\\n\\t)
|
||||
LIBS += -L$${BUILD_DIR}/$${BUILD_TYPE}/lib -llimereport
|
||||
}
|
||||
|
||||
|
@ -9,6 +9,7 @@ CONFIG += link_prl
|
||||
macx{
|
||||
CONFIG -= dll
|
||||
CONFIG += lib_bundle
|
||||
CONFIG += plugin
|
||||
}
|
||||
|
||||
DEFINES += LIMEREPORT_EXPORTS
|
||||
@ -25,11 +26,13 @@ include(limereport.pri)
|
||||
|
||||
unix {
|
||||
DESTDIR = $${BUILD_DIR}/$${BUILD_TYPE}/lib
|
||||
#QMAKE_POST_LINK += mkdir -p $$quote($${DESTDIR}/include) $$escape_expand(\\n\\t)
|
||||
for(FILE,EXTRA_FILES){
|
||||
QMAKE_POST_LINK += $$QMAKE_COPY $$quote($$FILE) $$quote($${DEST_INCLUDE_DIR}/include/) $$escape_expand(\\n\\t)
|
||||
QMAKE_POST_LINK += $$QMAKE_COPY $$quote($$FILE) $$quote($${DEST_INCLUDE_DIR}) $$escape_expand(\\n\\t)
|
||||
}
|
||||
QMAKE_POST_LINK += $(COPY_DIR) $$quote($${DEST_INCLUDE_DIR}*) $$quote($${DEST_DIR})
|
||||
macx{
|
||||
QMAKE_POST_LINK += mkdir -p $$quote($${DESTDIR}/include) $$escape_expand(\\n\\t)
|
||||
}
|
||||
QMAKE_POST_LINK += $(COPY_DIR) $$quote($${DEST_INCLUDE_DIR}*) $$quote($${DESTDIR}/include/)
|
||||
}
|
||||
|
||||
win32 {
|
||||
|
Loading…
Reference in New Issue
Block a user