Skip to content

Commit

Permalink
configure: add support for multiple libdirs in inline library sources
Browse files Browse the repository at this point in the history
while the command line doesn't actually permit it (that can be
re-evaluated separately), derivatives of the inline source type may want
to inject additional paths, as is the case with opcua.

the incdir field supports multiple entries without additional action.

Change-Id: I3860ca1fc8fab25c04eb63bdb2f855b77ff3b9a4
Reviewed-by: Rainer Keller <[email protected]>
Reviewed-by: Oswald Buddenhagen <[email protected]>
Reviewed-by: Joerg Bornemann <[email protected]>
  • Loading branch information
ossilator committed Dec 19, 2018
1 parent 91d9832 commit 32aa673
Showing 1 changed file with 6 additions and 2 deletions.
8 changes: 6 additions & 2 deletions mkspecs/features/qt_configure.prf
Original file line number Diff line number Diff line change
Expand Up @@ -707,8 +707,12 @@ defineTest(qtConfLibrary_inline) {
}

libdir = $$eval(config.input.$${input}.libdir)
!isEmpty(libdir): \
$${1}.libs = -L$$libdir $$eval($${1}.libs)
!isEmpty(libdir) {
libs =
for (ld, libdir): \
libs += -L$$ld
$${1}.libs = $$libs $$eval($${1}.libs)
}

!qtConfResolveAllLibs($$1): \
return(false)
Expand Down

0 comments on commit 32aa673

Please sign in to comment.