Commit 9f1f9df6 authored by Chris Harris's avatar Chris Harris

Pass QT_BINARY_DIR as HINTS to find_program(...)

When trying to locate xmlpatterns and qhelpgenerator QT_BINARY_DIR
should be passed as HINTS rather than PATHS. Otherwise, we can end
up with qmake being specified but system versions of xmlpatterns
and qhelpgenerator being used (as the standard system environment
variable PATH is searched before looking at PATHS), if these versions
don't match it can cause problems.

Change-Id: Id71bb4b95f117a347d9f004e37e1103aba71231a
parent 9e00f77e
......@@ -241,7 +241,7 @@ function (generate_htmls_from_xmls output_files xmls gui_xmls output_dir)
find_program(QT_XMLPATTERNS_EXECUTABLE
xmlpatterns
PATHS "${QT_BINARY_DIR}"
HINTS "${QT_BINARY_DIR}"
DOC "xmlpatterns used to generate html from Proxy documentation.")
mark_as_advanced(QT_XMLPATTERNS_EXECUTABLE)
......@@ -323,7 +323,7 @@ function(build_help_project name)
find_program(QT_HELP_GENERATOR
qhelpgenerator
PATHS "${QT_BINARY_DIR}"
HINTS "${QT_BINARY_DIR}"
DOC "qhelpgenerator used to compile Qt help project files")
mark_as_advanced(QT_HELP_GENERATOR)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment