diff options
author | Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> | 2016-10-10 20:26:52 +0200 |
---|---|---|
committer | Oswald Buddenhagen <oswald.buddenhagen@qt.io> | 2016-10-18 05:59:19 +0000 |
commit | 3a1245fdace1b008018dfb6b6334d5ebaec81b5e (patch) | |
tree | 7c30943fea4cda1c6e2657bed68d3cc34693c4b7 /mkspecs | |
parent | 7c1d640c0c6970342693ce04a60d9b1c84948b1e (diff) |
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>
Diffstat (limited to 'mkspecs')
-rw-r--r-- | mkspecs/features/qt_configure.prf | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/mkspecs/features/qt_configure.prf b/mkspecs/features/qt_configure.prf index 588a8ee0f5..e8fa0c6f76 100644 --- a/mkspecs/features/qt_configure.prf +++ b/mkspecs/features/qt_configure.prf @@ -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} |