aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexandru Croitor <alexandru.croitor@qt.io>2018-05-17 16:42:19 +0200
committerAlexandru Croitor <alexandru.croitor@qt.io>2018-05-17 14:55:09 +0000
commit2503b0bf10ede9390c0720cccf76a495b4c1bd5a (patch)
treee08eb2e7148b4da208c63d846a64253de7e83854
parent0c83e2408b81ec62e8eb787b01518ccb46236fc4 (diff)
Be more verbose about which Qt CMake dirs were found
Sometimes users might have stale cmake files installed into the same location due to building multiple Qt versions (e.g. 5.9.3 and 5.9.5), and find_package might bail out trying to use the older version. Make sure to print which cmake dir is used for each module, if the dir is available. Change-Id: I376ef95c682196c7f79d3c0e604d8225d1d2ff30 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
-rw-r--r--sources/pyside2/CMakeLists.txt11
1 files changed, 6 insertions, 5 deletions
diff --git a/sources/pyside2/CMakeLists.txt b/sources/pyside2/CMakeLists.txt
index e1ef529aa..d4150c93b 100644
--- a/sources/pyside2/CMakeLists.txt
+++ b/sources/pyside2/CMakeLists.txt
@@ -293,19 +293,20 @@ macro(COLLECT_MODULE_IF_FOUND shortname)
endif()
# If the module was found, and also the module path is the same as the
- # Qt5Core base path, we will generate the list with the modules to be install
+ # Qt5Core base path, we will generate the list with the modules to be installed
+ set(looked_in_message ". Looked in: ${${_name_dir}}")
if("${${_name_found}}" AND (("${found_basepath}" GREATER "0") OR ("${found_basepath}" EQUAL "0")))
- message(STATUS "${module_state} module ${name} found (${ARGN})")
+ message(STATUS "${module_state} module ${name} found (${ARGN})${looked_in_message}")
# record the shortnames for the tests
list(APPEND all_module_shortnames ${shortname})
else()
if("${module_state}" STREQUAL "optional")
- message(STATUS "optional module ${name} skipped")
+ message(STATUS "optional module ${name} skipped${looked_in_message}")
elseif("${module_state}" STREQUAL "essential")
message(STATUS "skipped module ${name} is essential!\n"
- " We do not guarantee that all tests are working.")
+ " We do not guarantee that all tests are working.${looked_in_message}")
else()
- message(FATAL_ERROR "module ${name} MISSING")
+ message(FATAL_ERROR "module ${name} MISSING${looked_in_message}")
endif()
endif()
endmacro()