From 1a0d3c9bf3535bc2906cf79fee3fd2ad8c4c708c Mon Sep 17 00:00:00 2001 From: Arttu Tarkiainen Date: Thu, 28 Apr 2022 11:15:49 +0300 Subject: installerfw.pri: fix POST_TARGETDEPS for app project templates The libinstaller dependency for application project templates was listed under wrong scope, and was only added when building with LZMA SDK. Consequently this broke rebuilding installerbase when making changes only to the libinstaller sub-project. Change-Id: I98cf391bcf502130ca8316c0d749f95b89485a38 Reviewed-by: Katja Marttila --- installerfw.pri | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/installerfw.pri b/installerfw.pri index d762b7543..40b38ffad 100644 --- a/installerfw.pri +++ b/installerfw.pri @@ -161,6 +161,12 @@ DEFINES += IFW_REPOSITORY_FORMAT_VERSION=$$IFW_REPOSITORY_FORMAT_VERSION win32-g++*: LIBS += -lmpr -luuid +equals(TEMPLATE, app) { + msvc:POST_TARGETDEPS += $$IFW_LIB_PATH/installer.lib + win32-g++*:POST_TARGETDEPS += $$IFW_LIB_PATH/libinstaller.a + unix:POST_TARGETDEPS += $$IFW_LIB_PATH/libinstaller.a +} + CONFIG(libarchive):equals(TEMPLATE, app) { LIBS += -llibarchive !isEmpty(IFW_ZLIB_LIBRARY) { @@ -197,7 +203,7 @@ CONFIG(libarchive):equals(TEMPLATE, app) { CONFIG(lzmasdk):equals(TEMPLATE, app) { LIBS += -l7z - msvc:POST_TARGETDEPS += $$IFW_LIB_PATH/installer.lib $$IFW_LIB_PATH/7z.lib - win32-g++*:POST_TARGETDEPS += $$IFW_LIB_PATH/libinstaller.a $$IFW_LIB_PATH/lib7z.a - unix:POST_TARGETDEPS += $$IFW_LIB_PATH/libinstaller.a $$IFW_LIB_PATH/lib7z.a + msvc:POST_TARGETDEPS += $$IFW_LIB_PATH/7z.lib + win32-g++*:POST_TARGETDEPS += $$IFW_LIB_PATH/lib7z.a + unix:POST_TARGETDEPS += $$IFW_LIB_PATH/lib7z.a } -- cgit v1.2.3