From f8d48bd39c4d2caef1dc189bd3bd95c5f5010780 Mon Sep 17 00:00:00 2001 From: Michal Klocek Date: Tue, 17 Sep 2013 10:21:47 +0200 Subject: [PATCH] Fix incremental builds The missing dependency to installer library causes corrupted incremental builds, installerbase should be rebuild when installer lib is changed. Change-Id: I588577f3d178c70dff2d84747f221d924e5cf38e Reviewed-by: Karsten Heimrich --- installerfw.pri | 6 ++++-- src/libs/7zip/7zip.pro | 3 +-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/installerfw.pri b/installerfw.pri index 4a42d332..ba24910d 100644 --- a/installerfw.pri +++ b/installerfw.pri @@ -106,6 +106,8 @@ static { LIBS += -l7z win32-g++*: LIBS += -lmpr -luuid - win32:exists($$IFW_LIB_PATH/installer.lib):POST_TARGETDEPS += $$IFW_LIB_PATH/installer.lib - unix:exists($$IFW_LIB_PATH/libinstaller.a):POST_TARGETDEPS += $$IFW_LIB_PATH/libinstaller.a + equals(TEMPLATE, app) { + win32:POST_TARGETDEPS += $$IFW_LIB_PATH/installer.lib $$IFW_LIB_PATH/7z.lib + unix:POST_TARGETDEPS += $$IFW_LIB_PATH/libinstaller.a $$IFW_LIB_PATH/lib7z.a + } } diff --git a/src/libs/7zip/7zip.pro b/src/libs/7zip/7zip.pro index 549778e6..01b69dad 100644 --- a/src/libs/7zip/7zip.pro +++ b/src/libs/7zip/7zip.pro @@ -1,8 +1,7 @@ -include(../../../installerfw.pri) - QT = core TARGET = 7z TEMPLATE = lib +include(../../../installerfw.pri) INCLUDEPATH += . .. CONFIG += staticlib DESTDIR = $$IFW_LIB_PATH