From a13f1dcd2e7b83fb0b318b9524021e7633519022 Mon Sep 17 00:00:00 2001
From: Michael Palimaka <kensington@gentoo.org>
Date: Fri, 23 Jun 2017 17:45:54 +0200
Subject: FindQHelpGenerator: avoid picking up Qt4 version

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
---
 find-modules/FindQHelpGenerator.cmake | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'find-modules/FindQHelpGenerator.cmake')

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)
-- 
cgit v1.2.1