1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix static lib dep addition

Browse Source 
leave MODULE_LIBS unmodified - MODULE_LIBS_ADD takes the role of the
filtered variable.

Change-Id: I2a67078bbc453eccc08317a1ca8e3228cbc3a8f7
Reviewed-by: Davide Pesavento <davidepesa@gmail.com>
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
This commit is contained in:
Oswald Buddenhagen 2012-12-08 11:47:31 +01:00 committed by The Qt Project
parent be0ef46b1d
commit 95a158d40f
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
mkspecs/features/qt_functions.prf
View File

@ -63,7 +63,8 @@ defineTest(qtAddModule) {
qtProcessModuleFlags(DEFINES, QT.$${1}.DEFINES) qtProcessModuleFlags(DEFINES, QT.$${1}.DEFINES)
MODULE_INCLUDES -= $$QMAKE_DEFAULT_INCDIRS MODULE_INCLUDES -= $$QMAKE_DEFAULT_INCDIRS
MODULE_LIBS -= $$QMAKE_DEFAULT_LIBDIRS MODULE_LIBS_ADD = $$MODULE_LIBS
MODULE_LIBS_ADD -= $$QMAKE_DEFAULT_LIBDIRS
INCLUDEPATH *= $$MODULE_INCLUDES INCLUDEPATH *= $$MODULE_INCLUDES
auto_use_privates|isEqual(2, UsePrivate) { # Tests function parameter 2 ($$2) being equal to 'UsePrivate' auto_use_privates|isEqual(2, UsePrivate) { # Tests function parameter 2 ($$2) being equal to 'UsePrivate'
@ -100,7 +101,7 @@ defineTest(qtAddModule) {
} }
isEmpty(LINKAGE) { isEmpty(LINKAGE) {
!isEmpty(MODULE_LIBS): LINKAGE = -L$$MODULE_LIBS !isEmpty(MODULE_LIBS_ADD): LINKAGE = -L$$MODULE_LIBS_ADD
lib = lib =
if(!debug_and_release|build_pass):CONFIG(debug, debug|release) { if(!debug_and_release|build_pass):CONFIG(debug, debug|release) {
win32: lib = $${MODULE_NAME}$${QT_LIBINFIX}d win32: lib = $${MODULE_NAME}$${QT_LIBINFIX}d
@ -115,7 +116,7 @@ defineTest(qtAddModule) {
PRE_TARGETDEPS *= $$MODULE_LIBS/$${QMAKE_PREFIX_STATICLIB}$${lib}.$${QMAKE_EXTENSION_STATICLIB} PRE_TARGETDEPS *= $$MODULE_LIBS/$${QMAKE_PREFIX_STATICLIB}$${lib}.$${QMAKE_EXTENSION_STATICLIB}
# Make sure we can link to uninstalled libraries # Make sure we can link to uninstalled libraries
!isEmpty(QT.$${1}.libs) { # Use unmodified path, so /usr/lib also works !isEmpty(MODULE_LIBS) {
for(rpl, QT.$${1}.rpath_link): \ for(rpl, QT.$${1}.rpath_link): \
QMAKE_RPATHLINKDIR *= $$rpl QMAKE_RPATHLINKDIR *= $$rpl
!auto_use_privates:!isEqual(2, UsePrivate): \ !auto_use_privates:!isEqual(2, UsePrivate): \
@ -125,9 +126,9 @@ defineTest(qtAddModule) {
} }
# Only link to this module if a libs directory is set, else this is just a module # Only link to this module if a libs directory is set, else this is just a module
# to give access to sources or include files, and not for linking. # to give access to sources or include files, and not for linking.
!isEmpty(QT.$${1}.libs) { # Use unmodified path, so /usr/lib also works !isEmpty(MODULE_LIBS) {
!isEmpty(QMAKE_LSB) { !isEmpty(QMAKE_LSB) {
!isEmpty(MODULE_LIBS): QMAKE_LFLAGS *= --lsb-libpath=$$MODULE_LIBS !isEmpty(MODULE_LIBS_ADD): QMAKE_LFLAGS *= --lsb-libpath=$$MODULE_LIBS_ADD
QMAKE_LIBDIR *= /opt/lsb/lib QMAKE_LIBDIR *= /opt/lsb/lib
QMAKE_LFLAGS *= --lsb-shared-libs=$${MODULE_NAME}$${QT_LIBINFIX} QMAKE_LFLAGS *= --lsb-shared-libs=$${MODULE_NAME}$${QT_LIBINFIX}
} }