From cfd971cd46131c7e852f32c68eb33f4d5d9cabab Mon Sep 17 00:00:00 2001
From: Arin Alexander <arin_a@bk.ru>
Date: Thu, 31 Mar 2016 03:42:12 +0400
Subject: [PATCH] Project structure changed

---
 common.pri                |  1 +
 limereport/limereport.pro | 13 +++++++------
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/common.pri b/common.pri
index df0e70f..4799742 100644
--- a/common.pri
+++ b/common.pri
@@ -11,6 +11,7 @@ CONFIG(release, debug|release){
 }
 
 BUILD_DIR = $$PWD/build/$${QT_VERSION}
+DEST_INCLUDE_DIR = $$PWD/include/
 
 unix:!macx {
     ARCH_DIR       = $${OUT_PWD}/unix
diff --git a/limereport/limereport.pro b/limereport/limereport.pro
index ffec743..77c25ad 100644
--- a/limereport/limereport.pro
+++ b/limereport/limereport.pro
@@ -23,26 +23,27 @@ EXTRA_FILES += \
 
 include(limereport.pri)
 
-DEST_DIR = $$PWD/../include/
-
 unix {
     DESTDIR  = $${BUILD_DIR}/$${BUILD_TYPE}/lib
-    QMAKE_POST_LINK += mkdir -p $$quote($${DESTDIR}/include) $$escape_expand(\\n\\t)
+    #QMAKE_POST_LINK += mkdir -p $$quote($${DESTDIR}/include) $$escape_expand(\\n\\t)
     for(FILE,EXTRA_FILES){
-        QMAKE_POST_LINK += $$QMAKE_COPY $$quote($$FILE) $$quote($${DESTDIR}/include/) $$escape_expand(\\n\\t)
+        QMAKE_POST_LINK += $$QMAKE_COPY $$quote($$FILE) $$quote($${DEST_INCLUDE_DIR}/include/) $$escape_expand(\\n\\t)
     }
+    QMAKE_POST_LINK += $(COPY_DIR) $$quote($${DEST_INCLUDE_DIR}*) $$quote($${DEST_DIR})
 }
 
 win32 {
     EXTRA_FILES ~= s,/,\\,g
     BUILD_DIR ~= s,/,\\,g
     DESTDIR = $${BUILD_DIR}/$${BUILD_TYPE}/lib
-    DEST_DIR = $$DESTDIR
+    DEST_DIR = $$DESTDIR/include/
     DEST_DIR ~= s,/,\\,g
+    DEST_INCLUDE_DIR ~= s,/,\\,g
 
     for(FILE,EXTRA_FILES){
-        QMAKE_POST_LINK += $$QMAKE_COPY $$quote($$FILE) $$quote($${DEST_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})
 }
 
 contains(CONFIG,zint){