Merge pull request #120 from frostasm/master

Add ability to install binary and header files to Qt installation dir
This commit is contained in:
fralx 2018-08-06 19:05:26 +03:00 committed by GitHub
commit c2dab351cb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
8 changed files with 68 additions and 11 deletions

2
.qmake.cache.in Normal file
View File

@ -0,0 +1,2 @@
TOP_SRC_DIR=$$PWD
TOP_BUILD_DIR=$$OUT_PWD

2
.qmake.conf Normal file
View File

@ -0,0 +1,2 @@
TOP_SRC_DIR=$$PWD
TOP_BUILD_DIR=$$shadowed($$PWD)

View File

@ -18,7 +18,7 @@ install:
script: script:
- qmake -r - qmake -r limereport.pro
- make - make
- make check - make check

View File

@ -1,4 +1,7 @@
!contains(CONFIG, no_build_translations){
CONFIG += build_translations CONFIG += build_translations
}
!contains(CONFIG, no_zint){ !contains(CONFIG, no_zint){
CONFIG += zint CONFIG += zint
@ -24,7 +27,12 @@ CONFIG(release, debug|release){
BUILD_TYPE = debug BUILD_TYPE = debug
} }
BUILD_DIR = $$PWD/build/$${QT_VERSION} isEmpty(TOP_BUILD_DIR) {
BUILD_DIR = $${OUT_PWD}/build/$${QT_VERSION}
}else{
BUILD_DIR = $${TOP_BUILD_DIR}/build/$${QT_VERSION}
}
DEST_INCLUDE_DIR = $$PWD/include DEST_INCLUDE_DIR = $$PWD/include
unix{ unix{
ARCH_DIR = $${OUT_PWD}/unix ARCH_DIR = $${OUT_PWD}/unix

3
initvars.pro Normal file
View File

@ -0,0 +1,3 @@
TEMPLATE=subdirs
SUBDIRS= # don't build anything, we're just generating the .qmake.cache file
QMAKE_SUBSTITUTES += .qmake.cache.in

View File

@ -10,12 +10,19 @@ contains(CONFIG, zint){
} }
export($$CONFIG) export($$CONFIG)
SUBDIRS += \
limereport
CONFIG += ordered CONFIG += ordered
SUBDIRS += \
initvars.pro \
limereport \
demo_r1 \
demo_r2 \
designer
SUBDIRS += demo_r1 demo_r2 designer # QMake top level srcdir and builddir
# https://wiki.qt.io/QMake-top-level-srcdir-and-builddir
#Qt4 .qmake.cache.in
#Qt5 .qmake.conf
OTHER_FILES += \
.qmake.conf \
.qmake.cache.in

22
limereport/limereport.prf Normal file
View File

@ -0,0 +1,22 @@
QT += xml sql script
greaterThan(QT_MAJOR_VERSION, 4) {
QT += widgets printsupport
}
INCLUDEPATH += $$[QT_INSTALL_HEADERS]/LimeReport
CONFIG(debug, debug|release) {
LIB_NAME = limereportd
} else {
LIB_NAME = limereport
}
greaterThan(QT_MAJOR_VERSION, 4) {
LIBS += -l$${LIB_NAME}
} else {
qtAddLibrary($${LIB_NAME})
}
DEFINES += LIMEREPORT
DEFINES -= NO_LIMEREPORT

View File

@ -37,7 +37,6 @@ contains(CONFIG, staticlib){
} }
EXTRA_FILES += \ EXTRA_FILES += \
$$PWD/lrglobal.cpp \
$$PWD/lrglobal.h \ $$PWD/lrglobal.h \
$$PWD/lrdatasourcemanagerintf.h \ $$PWD/lrdatasourcemanagerintf.h \
$$PWD/lrreportengine.h \ $$PWD/lrreportengine.h \
@ -92,6 +91,20 @@ contains(CONFIG,zint){
} }
#### Install mkspecs, headers and libs to QT_INSTALL_DIR
headerFiles.path = $$[QT_INSTALL_HEADERS]/LimeReport/
headerFiles.files = $${DEST_INCLUDE_DIR}/*
INSTALLS += headerFiles
mkspecs.path = $$[QT_INSTALL_DATA]/mkspecs/features
mkspecs.files = limereport.prf
INSTALLS += mkspecs
target.path = $$[QT_INSTALL_LIBS]
INSTALLS += target
####### #######
####Automatically build required translation files (*.qm) ####Automatically build required translation files (*.qm)