QuasarApp/installer-framework
4
0
Fork 0
mirror of https://github.com/QuasarApp/installer-framework.git synced 2025-05-06 10:09:34 +00:00
Code Issues Projects Releases Wiki Activity

Always build libinstaller as a static library

Browse Source 
This fixes the build if IFW is built with a dynamically linked Qt, and
does not otherwise affect use of static builds of Qt.

Task-number: QTIFW-993
Change-Id: I1e6807e522adde339263c697fa4a1353250a2e3f
Reviewed-by: Katja Marttila <katja.marttila@qt.io>
This commit is contained in:
Jake Petroules 2017-07-28 14:44:29 -07:00 committed by Katja Marttila
parent 21214c88dd
commit 0089d7b3b7
2 changed files with 8 additions and 8 deletions

14
installerfw.pri

@ -126,13 +126,11 @@ DEFINES += NOMINMAX QT_NO_CAST_FROM_ASCII QT_STRICT_ITERATORS QT_USE_QSTRINGBUIL
IFW_VERSION_STR=$$IFW_VERSION_STR IFW_VERSION=$$IFW_VERSION
DEFINES += IFW_REPOSITORY_FORMAT_VERSION=$$IFW_REPOSITORY_FORMAT_VERSION
static {
LIBS += -l7z
win32-g++*: LIBS += -lmpr -luuid
LIBS += -l7z
win32-g++*: LIBS += -lmpr -luuid
equals(TEMPLATE, app) {
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
}
equals(TEMPLATE, app) {
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
}

2
src/libs/installer/installer.pro

@ -2,6 +2,8 @@ TEMPLATE = lib
TARGET = installer
INCLUDEPATH += . ..
CONFIG += staticlib
include(../7zip/7zip.pri)
include(../kdtools/kdtools.pri)
include(../../../installerfw.pri)