diff options
| author | Friedrich W. H. Kossebau <kossebau@kde.org> | 2017-07-18 18:31:47 +0200 |
|---|---|---|
| committer | Friedrich W. H. Kossebau <kossebau@kde.org> | 2017-07-29 01:20:36 +0200 |
| commit | 03fc1de44ef988112f65412728cfe81a3658a1be (patch) | |
| tree | b04372faac1b9b7e71a2389086e06a863c307377 /kde-modules | |
| parent | f5c11c00198e809d45399b6c8496ac838f28ad60 (diff) | |
| download | extra-cmake-modules-03fc1de44ef988112f65412728cfe81a3658a1be.tar.gz extra-cmake-modules-03fc1de44ef988112f65412728cfe81a3658a1be.tar.bz2 | |
Fix usage of query_qmake: differ between calls expecting qmake or not
Summary:
when KDE_INSTALL_USE_QT_SYS_PATHS has been explicitely set,
qmake can be considered a required dependency, otherwise the
paths will not be known, which would be unexpected.
Also does the code calling query_qmake, besides the one testing
for the same install prefix, not handle the case of empty strings
being returned and then results in bogus behaviour.
Thus this patch makes code fail hard if query_qmake is expected
to yield a result, but no qmake executable is found.
Reviewers: #frameworks, ltoscano, rdieter, apol
Reviewed By: apol
Subscribers: #build_system
Tags: #frameworks, #build_system
Differential Revision: https://phabricator.kde.org/D6772
Diffstat (limited to 'kde-modules')
| -rw-r--r-- | kde-modules/KDEInstallDirs.cmake | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kde-modules/KDEInstallDirs.cmake b/kde-modules/KDEInstallDirs.cmake index 8029f0af..b0e651f6 100644 --- a/kde-modules/KDEInstallDirs.cmake +++ b/kde-modules/KDEInstallDirs.cmake @@ -455,7 +455,7 @@ include("${ECM_MODULE_DIR}/ECMQueryQmake.cmake") set(_default_KDE_INSTALL_USE_QT_SYS_PATHS OFF) if(NOT DEFINED KDE_INSTALL_USE_QT_SYS_PATHS) - query_qmake(qt_install_prefix_dir QT_INSTALL_PREFIX) + query_qmake(qt_install_prefix_dir QT_INSTALL_PREFIX TRY) if(qt_install_prefix_dir STREQUAL "${CMAKE_INSTALL_PREFIX}") message(STATUS "Installing in the same prefix as Qt, adopting their path scheme.") set(_default_KDE_INSTALL_USE_QT_SYS_PATHS ON) |