diff --git a/3rdparty/zint-2.6.1/backend_qt/backend_qt.pro b/3rdparty/zint-2.6.1/backend_qt/backend_qt.pro index 06203b6..63eadfd 100644 --- a/3rdparty/zint-2.6.1/backend_qt/backend_qt.pro +++ b/3rdparty/zint-2.6.1/backend_qt/backend_qt.pro @@ -25,7 +25,7 @@ unix{ INCLUDEPATH += $$PWD/../backend DEFINES += _CRT_SECURE_NO_WARNINGS _CRT_NONSTDC_NO_WARNINGS ZINT_VERSION=\\\"$$VERSION\\\" -contains(CONFIG,release) { +CONFIG(release, debug|release){ TARGET = QtZint } else { TARGET = QtZintd diff --git a/common.pri b/common.pri index 02aa3e9..9812b88 100644 --- a/common.pri +++ b/common.pri @@ -118,7 +118,7 @@ RCC_DIR = $${ARCH_DIR}/$${BUILD_TYPE}/rcc LIMEREPORT_VERSION_MAJOR = 1 LIMEREPORT_VERSION_MINOR = 4 -LIMEREPORT_VERSION_RELEASE = 103 +LIMEREPORT_VERSION_RELEASE = 105 LIMEREPORT_VERSION = '$${LIMEREPORT_VERSION_MAJOR}.$${LIMEREPORT_VERSION_MINOR}.$${LIMEREPORT_VERSION_RELEASE}' DEFINES *= LIMEREPORT_VERSION_STR=\\\"$${LIMEREPORT_VERSION}\\\" diff --git a/demo_r1/demo_r1.pro b/demo_r1/demo_r1.pro index 9c4c76d..ddaa50d 100644 --- a/demo_r1/demo_r1.pro +++ b/demo_r1/demo_r1.pro @@ -1,7 +1,7 @@ include(../common.pri) QT += core gui -contains(CONFIG,release) { +CONFIG(release, debug|release) { TARGET = LRDemo_r1 } else { TARGET = LRDemo_r1d @@ -31,51 +31,58 @@ macx{ } unix:{ - LIBS += -L$${DEST_LIBS} -llimereport - !contains(CONFIG, static_build){ - contains(CONFIG,zint){ - LIBS += -L$${DEST_LIBS} -lQtZint - } - } - DESTDIR = $$DEST_DIR -# QMAKE_POST_LINK += mkdir -p $$quote($$REPORTS_DIR) | - QMAKE_POST_LINK += $$QMAKE_COPY_DIR $$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 - QMAKE_LFLAGS += -Wl,--rpath=\\\$\$ORIGIN/../lib - QMAKE_LFLAGS_RPATH += #. .. ./libs -} - target.path = $${DEST_DIR} - INSTALLS = target + DESTDIR = $$DEST_DIR + # QMAKE_POST_LINK += mkdir -p $$quote($$REPORTS_DIR) | + QMAKE_POST_LINK += $$QMAKE_COPY_DIR $$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 + QMAKE_LFLAGS += -Wl,--rpath=\\\$\$ORIGIN/../lib + QMAKE_LFLAGS_RPATH += #. .. ./libs + } + target.path = $${DEST_DIR} + INSTALLS = target } win32 { - EXTRA_DIR ~= s,/,\\,g - DEST_DIR ~= s,/,\\,g - REPORTS_DIR ~= s,/,\\,g - DESTDIR = $$DEST_DIR - RC_FILE += mainicon.rc + contains(QMAKE_HOST.os, Linux){ + QMAKE_POST_LINK += $$QMAKE_COPY_DIR $$quote($$EXTRA_DIR) $$quote($$REPORTS_DIR) $$escape_expand(\n\t) + } else { + EXTRA_DIR ~= s,/,\\,g + DEST_DIR ~= s,/,\\,g + REPORTS_DIR ~= s,/,\\,g - greaterThan(QT_MAJOR_VERSION, 4) { + RC_FILE += mainicon.rc + + greaterThan(QT_MAJOR_VERSION, 4) { QMAKE_POST_LINK += $$QMAKE_COPY_DIR $$shell_quote($$EXTRA_DIR\\*) $$shell_quote($$REPORTS_DIR\\demo_reports) $$escape_expand(\\n\\t) } lessThan(QT_MAJOR_VERSION, 5){ QMAKE_POST_LINK += $$QMAKE_COPY_DIR $$quote($$EXTRA_DIR\\*) $$quote($$REPORTS_DIR\\demo_reports) $$escape_expand(\\n\\t) } - !contains(CONFIG, static_build){ - contains(CONFIG,zint){ - LIBS += -L$${DEST_LIBS} -lQtZint - } + #QMAKE_POST_LINK += $$QMAKE_COPY_DIR \"$$EXTRA_DIR\" \"$$REPORTS_DIR\\demo_reports\" $$escape_expand(\\n\\t) + #QMAKE_POST_LINK += $$QMAKE_COPY_DIR $$quote($$EXTRA_DIR\\*) $$quote($$REPORTS_DIR\\demo_reports) $$escape_expand(\\n\\t) } - LIBS += -L$${DEST_LIBS} - contains(CONFIG,release) { - LIBS += -llimereport - } else { - LIBS += -llimereportd - } } +LIBS += -L$${DEST_LIBS} +CONFIG(debug, debug|release) { + LIBS += -llimereportd +} else { + LIBS += -llimereport +} +message($$LIBS) +!contains(CONFIG, static_build){ + contains(CONFIG,zint){ + LIBS += -L$${DEST_LIBS} + CONFIG(debug, debug|release) { + LIBS += -lQtZintd + } else { + LIBS += -lQtZint + } + } +} diff --git a/demo_r2/demo_r2.pro b/demo_r2/demo_r2.pro index a5961c0..c75365b 100644 --- a/demo_r2/demo_r2.pro +++ b/demo_r2/demo_r2.pro @@ -1,7 +1,7 @@ include(../common.pri) QT += core gui -contains(CONFIG,release) { +CONFIG(release, debug|release){ TARGET = LRDemo_r2 } else { TARGET = LRDemo_r2d @@ -32,49 +32,53 @@ macx{ } unix:{ - LIBS += -L$${DEST_LIBS} -llimereport - !contains(CONFIG, static_build){ - contains(CONFIG,zint){ - LIBS += -L$${DEST_LIBS} -lQtZint - } - } DESTDIR = $$DEST_DIR QMAKE_POST_LINK += $$QMAKE_COPY_DIR $$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 - QMAKE_LFLAGS += -Wl,--rpath=\\\$\$ORIGIN/../lib - QMAKE_LFLAGS_RPATH += #. .. ./libs -} + linux{ + #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 } win32 { - EXTRA_DIR ~= s,/,\\,g - DEST_DIR ~= s,/,\\,g - REPORTS_DIR ~= s,/,\\,g - DESTDIR = $$DEST_DIR - RC_FILE += mainicon.rc - !contains(CONFIG, static_build){ - contains(CONFIG,zint){ - LIBS += -L$${DEST_LIBS} -lQtZint - } - } - LIBS += -L$${DEST_LIBS} - contains(CONFIG,release) { - LIBS += -llimereport - } else { - LIBS += -llimereportd - } + contains(QMAKE_HOST.os, Linux){ + QMAKE_POST_LINK += $$QMAKE_COPY_DIR $$quote($$EXTRA_DIR) $$quote($$REPORTS_DIR) $$escape_expand(\n\t) + } else { + EXTRA_DIR ~= s,/,\\,g + DEST_DIR ~= s,/,\\,g + REPORTS_DIR ~= s,/,\\,g - greaterThan(QT_MAJOR_VERSION, 4) { + RC_FILE += mainicon.rc + greaterThan(QT_MAJOR_VERSION, 4) { QMAKE_POST_LINK += $$QMAKE_COPY_DIR $$shell_quote($$EXTRA_DIR\\*) $$shell_quote($$REPORTS_DIR\\demo_reports) $$escape_expand(\\n\\t) } lessThan(QT_MAJOR_VERSION, 5){ QMAKE_POST_LINK += $$QMAKE_COPY_DIR $$quote($$EXTRA_DIR\\*) $$quote($$REPORTS_DIR\\demo_reports) $$escape_expand(\\n\\t) } + #QMAKE_POST_LINK += $$QMAKE_COPY_DIR \"$$EXTRA_DIR\" \"$$REPORTS_DIR\\demo_reports\" $$escape_expand(\\n\\t) + } } +LIBS += -L$${DEST_LIBS} +CONFIG(debug, debug|release) { + LIBS += -llimereportd +} else { + LIBS += -llimereport +} + +!contains(CONFIG, static_build){ + contains(CONFIG,zint){ + LIBS += -L$${DEST_LIBS} + CONFIG(debug, debug|release) { + LIBS += -lQtZintd + } else { + LIBS += -lQtZint + } + } +} diff --git a/limereport/limereport.pro b/limereport/limereport.pro index dcb088b..4ea7447 100644 --- a/limereport/limereport.pro +++ b/limereport/limereport.pro @@ -1,7 +1,7 @@ -contains(CONFIG,release) { - TARGET = limereport +CONFIG(release, debug|release){ + TARGET = limereport } else { - TARGET = limereportd + TARGET = limereportd } TEMPLATE = lib @@ -61,17 +61,25 @@ unix:{ } win32 { - EXTRA_FILES ~= s,/,\\,g - BUILD_DIR ~= s,/,\\,g DESTDIR = $${DEST_LIBS} - DEST_DIR = $$DESTDIR/include - DEST_DIR ~= s,/,\\,g - DEST_INCLUDE_DIR ~= s,/,\\,g + contains(QMAKE_HOST.os, 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 + } + QMAKE_POST_LINK += $$QMAKE_COPY_DIR $$quote($${DEST_INCLUDE_DIR}) $$quote($${DESTDIR}) + } else { + EXTRA_FILES ~= s,/,\\,g + BUILD_DIR ~= s,/,\\,g + DEST_DIR = $$DESTDIR/include + DEST_DIR ~= s,/,\\,g + DEST_INCLUDE_DIR ~= s,/,\\,g - for(FILE,EXTRA_FILES){ - QMAKE_POST_LINK += $$QMAKE_COPY \"$$FILE\" \"$${DEST_INCLUDE_DIR}\" $$escape_expand(\\n\\t) + for(FILE,EXTRA_FILES){ + QMAKE_POST_LINK += $$QMAKE_COPY \"$$FILE\" \"$${DEST_INCLUDE_DIR}\" $$escape_expand(\\n\\t) + } + QMAKE_POST_LINK += $$QMAKE_COPY_DIR \"$${DEST_INCLUDE_DIR}\" \"$${DEST_DIR}\" } - QMAKE_POST_LINK += $$QMAKE_COPY_DIR \"$${DEST_INCLUDE_DIR}\" \"$${DEST_DIR}\" } contains(CONFIG,zint){