whytofly
/
qt6-bb10
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

slightly improve logging of library probing 

Change-Id: Idd137251c6db5effd3571591d837d49e8fb9525d
Reviewed-by: Jake Petroules <jake.petroules@qt.io>
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
bb10
Oswald Buddenhagen 2016-10-10 20:26:52 +02:00 committed by Oswald Buddenhagen
parent 7c1d640c0c
commit 3a1245fdac
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
mkspecs/features/qt_configure.prf
View File

@ -615,7 +615,6 @@ defineTest(qtConfHandleLibrary) {
result = false
for (s, $${lpfx}.sources._KEYS_) {
qtLog("Trying source $$s of library $${1}.")
spfx = $${lpfx}.sources.$${s}
t = $$eval($${spfx}.type)
@ -623,13 +622,15 @@ defineTest(qtConfHandleLibrary) {
!defined($$call, test): \
error("Library $${1} source $${s} has unknown type '$$t'")
qtLog("Trying source $$s (type $$t) of library $${1} ...")
!$$qtConfEvaluate($$eval($${spfx}.condition)) {
qtLog("Source $$s of library $$1 failed condition.")
qtLog(" => source failed condition.")
next()
}
!$${call}($$spfx) {
qtLog("Source $$s of library $$1 produced no result.")
qtLog(" => source produced no result.")
next()
}
@ -638,11 +639,13 @@ defineTest(qtConfHandleLibrary) {
$${lpfx}.literal_args = $$qtConfLibraryArgs($$spfx)
$${lpfx}.host = $$eval($${spfx}.host)
!qtConfTest_compile($$lpfx) {
qtLog("Source $$s of library $$1 failed verification.")
qtLog(" => source failed verification.")
next()
}
}
qtLog(" => source accepted.")
$${lpfx}.cache += source
for (v, $$list(libs includes cflags version export)): \
$${lpfx}.cache += sources.$${s}.$${v}