diff options
| author | Michael Palimaka <kensington@gentoo.org> | 2017-06-23 17:45:54 +0200 |
|---|---|---|
| committer | Friedrich W. H. Kossebau <kossebau@kde.org> | 2017-06-23 17:48:53 +0200 |
| commit | a13f1dcd2e7b83fb0b318b9524021e7633519022 (patch) | |
| tree | 654b1d205926a50321e6e5f3d589e1eb69b670b8 | |
| parent | d82778d555465095c84bc5722aa7af74b44397fa (diff) | |
| download | extra-cmake-modules-5.36.0-rc1.tar.gz extra-cmake-modules-5.36.0-rc1.tar.bz2 | |
FindQHelpGenerator: avoid picking up Qt4 versionv5.36.0-rc1v5.36.0
Summary:
Passing NO_DEFAULT_PATH ignores $PATH and ensures that we use the
previously-detected Qt5 binary path.
Test Plan:
qhelpgenerator is now picked up from the same location as Qt5::qmake. Before,
anything in $PATH was preferred even if it was the Qt 4 version.
Reviewers: #frameworks, kossebau, kfunk
Reviewed By: kossebau, kfunk
Subscribers: alexeymin, asturmlechner, #build_system
Tags: #frameworks, #build_system
Differential Revision: https://phabricator.kde.org/D6249
| -rw-r--r-- | find-modules/FindQHelpGenerator.cmake | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/find-modules/FindQHelpGenerator.cmake b/find-modules/FindQHelpGenerator.cmake index 3d55da11..50aef27b 100644 --- a/find-modules/FindQHelpGenerator.cmake +++ b/find-modules/FindQHelpGenerator.cmake @@ -44,13 +44,13 @@ else() else() set(_path) endif() - # TODO: prevent that the Qt4 version is picked up find_program(QHelpGenerator_EXECUTABLE NAMES qhelpgenerator-qt5 qhelpgenerator - PATH + PATHS ${_path} + NO_DEFAULT_PATH ) endif() mark_as_advanced(QHelpGenerator_EXECUTABLE) |