diff --git a/common.pri b/common.pri index 4799742..b9892f8 100644 --- a/common.pri +++ b/common.pri @@ -11,7 +11,7 @@ CONFIG(release, debug|release){ } BUILD_DIR = $$PWD/build/$${QT_VERSION} -DEST_INCLUDE_DIR = $$PWD/include/ +DEST_INCLUDE_DIR = $$PWD/include unix:!macx { ARCH_DIR = $${OUT_PWD}/unix diff --git a/demo_r1/demo_r1.pro b/demo_r1/demo_r1.pro index be82dd1..5591daf 100644 --- a/demo_r1/demo_r1.pro +++ b/demo_r1/demo_r1.pro @@ -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 diff --git a/limereport/limereport.pro b/limereport/limereport.pro index 7fad193..309a17a 100644 --- a/limereport/limereport.pro +++ b/limereport/limereport.pro @@ -25,15 +25,22 @@ EXTRA_FILES += \ include(limereport.pri) -unix { +unix:{ DESTDIR = $${BUILD_DIR}/$${BUILD_TYPE}/lib - for(FILE,EXTRA_FILES){ - QMAKE_POST_LINK += $$QMAKE_COPY $$quote($$FILE) $$quote($${DEST_INCLUDE_DIR}) $$escape_expand(\\n\\t) + 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{ - QMAKE_POST_LINK += mkdir -p $$quote($${DESTDIR}/include) $$escape_expand(\\n\\t) -} - QMAKE_POST_LINK += $(COPY_DIR) $$quote($${DEST_INCLUDE_DIR}*) $$quote($${DESTDIR}/include/) + macx{ + for(FILE,EXTRA_FILES){ + QMAKE_POST_LINK += $$QMAKE_COPY $$quote($$FILE) $$quote($${DEST_INCLUDE_DIR}) $$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) } win32 {