From 03fc1de44ef988112f65412728cfe81a3658a1be Mon Sep 17 00:00:00 2001 From: "Friedrich W. H. Kossebau" Date: Tue, 18 Jul 2017 18:31:47 +0200 Subject: 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 --- modules/ECMAddQch.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'modules/ECMAddQch.cmake') diff --git a/modules/ECMAddQch.cmake b/modules/ECMAddQch.cmake index 2177bf0f..f5a09dff 100644 --- a/modules/ECMAddQch.cmake +++ b/modules/ECMAddQch.cmake @@ -289,7 +289,7 @@ function(_ecm_ensure_qt_qch_targets) # get Qt version, if any find_package(Qt5Core CONFIG QUIET) # lookup tag files - query_qmake(qt_docs_dir QT_INSTALL_DOCS) + query_qmake(qt_docs_dir QT_INSTALL_DOCS TRY) find_path(_qtcoreTagsPath qtcore/qtcore.tags PATHS ${qt_docs_dir} -- cgit v1.2.1