diff options
| author | Alex Merry <alex.merry@kde.org> | 2014-12-07 18:35:01 +0000 |
|---|---|---|
| committer | Alex Merry <alex.merry@kde.org> | 2014-12-07 18:36:20 +0000 |
| commit | 81627ad86d3d7d5e5a7d130dfc746d5b1b58cbe7 (patch) | |
| tree | ddc6cc72744663092fe5e12db1e1f3274bd60ae2 /modules | |
| parent | 3f1020ca0ae58dbfd43169a691313116898647d5 (diff) | |
| download | extra-cmake-modules-81627ad86d3d7d5e5a7d130dfc746d5b1b58cbe7.tar.gz extra-cmake-modules-81627ad86d3d7d5e5a7d130dfc746d5b1b58cbe7.tar.bz2 | |
Fix ECMQueryQmake when Qt5Core is missing.
The wrong syntax for set() was being used. This change also allows
QMAKE_EXECUTABLE to be used to override the qmake path even when the
Qt5Core CMake module is found.
Diffstat (limited to 'modules')
| -rw-r--r-- | modules/ECMQueryQmake.cmake | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/modules/ECMQueryQmake.cmake b/modules/ECMQueryQmake.cmake index 2aa19ff7..725e2eb6 100644 --- a/modules/ECMQueryQmake.cmake +++ b/modules/ECMQueryQmake.cmake @@ -1,10 +1,11 @@ find_package(Qt5Core QUIET) +set(_qmake_executable_default "qmake-qt5") if (TARGET Qt5::qmake) - get_target_property(QMAKE_EXECUTABLE Qt5::qmake LOCATION) -else() - set(QMAKE_EXECUTABLE "qmake-qt5" CACHE) + get_target_property(_qmake_executable_default Qt5::qmake LOCATION) endif() +set(QMAKE_EXECUTABLE "qmake-qt5" + CACHE FILEPATH "Location of the Qt5 qmake executable") # This is not public API (yet)! function(query_qmake result_variable qt_variable) |