diff options
| author | Aleix Pol <aleixpol@kde.org> | 2015-06-23 22:54:11 +0200 |
|---|---|---|
| committer | Aleix Pol <aleixpol@kde.org> | 2015-06-23 22:54:11 +0200 |
| commit | 51fb1c07bd9e6fcbb4204feb817fe94451593133 (patch) | |
| tree | 88296aacb2bd7874bc987f9f2ed4ec5950168e37 | |
| parent | cb42a57b1da01b51ce02f86f9a57b5ddbe5196d0 (diff) | |
| download | extra-cmake-modules-51fb1c07bd9e6fcbb4204feb817fe94451593133.tar.gz extra-cmake-modules-51fb1c07bd9e6fcbb4204feb817fe94451593133.tar.bz2 | |
Improve error reporting of query_qmake macrov5.12.0-rc1v5.12.0
In case it fails, offer an error message and the attempted call, to make
sure we can react accordingly.
Note that the proper error argument is FATAL_ERROR, not FATAL.
REVIEW: 124106
| -rw-r--r-- | modules/ECMQueryQmake.cmake | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/modules/ECMQueryQmake.cmake b/modules/ECMQueryQmake.cmake index c880671f..8f4cf177 100644 --- a/modules/ECMQueryQmake.cmake +++ b/modules/ECMQueryQmake.cmake @@ -19,6 +19,7 @@ function(query_qmake result_variable qt_variable) file(TO_CMAKE_PATH "${output}" output_path) set(${result_variable} "${output_path}" PARENT_SCOPE) else() - message(FATAL "QMake call failed: ${error}") + message(WARNING "Failed call: ${QMAKE_EXECUTABLE} -query \"${qt_variable}\"") + message(FATAL_ERROR "QMake call failed: ${return_code}") endif() endfunction() |