diff options
| author | Aleix Pol <aleixpol@kde.org> | 2016-07-27 01:44:31 +0200 |
|---|---|---|
| committer | Aleix Pol <aleixpol@kde.org> | 2016-07-27 01:44:31 +0200 |
| commit | c07196c98c6998813fee3ab2889bba5d36447f58 (patch) | |
| tree | f83920e7681f2a9478da64d2d3cdb570c6a12014 | |
| parent | 8ac7abb78d97210c5cbbc87fba83d58d7b843a8d (diff) | |
| download | extra-cmake-modules-5.25.0.tar.gz extra-cmake-modules-5.25.0.tar.bz2 | |
Fix inclusion when there's no Qt5v5.25.0-rc1v5.25.0
ECMQueryQmake will fail as it's designed to only work with Qt5. We
don't want to terminate the execution there, just to spit a warning
and leave. If we suggest qmake-qt5 as a command, we'll end up performing
the call anyway.
This will fix the ExecuteCoreModules test under latest-qt4 build.
| -rw-r--r-- | modules/ECMQueryQmake.cmake | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/modules/ECMQueryQmake.cmake b/modules/ECMQueryQmake.cmake index 0a3129d4..fa0949df 100644 --- a/modules/ECMQueryQmake.cmake +++ b/modules/ECMQueryQmake.cmake @@ -1,6 +1,8 @@ find_package(Qt5Core QUIET) -set(_qmake_executable_default "qmake-qt5") +if (Qt5Core_FOUND) + set(_qmake_executable_default "qmake-qt5") +endif () if (TARGET Qt5::qmake) get_target_property(_qmake_executable_default Qt5::qmake LOCATION) endif() |