From 71ab4a83c2408d47835c3acda96204f9d68b1524 Mon Sep 17 00:00:00 2001 From: Tobias Hunger Date: Tue, 4 Jun 2019 09:37:01 +0200 Subject: [PATCH] CMake: Use Qt5::qhelpgenerator target I missed that before, but it is actually there:-) Change-Id: Ifaeaba4aa524980328cb68a8a039ff58e4b74ed8 Reviewed-by: Volker Krause --- doc/CMakeLists.txt | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/doc/CMakeLists.txt b/doc/CMakeLists.txt index 227bf790c5c..0a750d44a45 100644 --- a/doc/CMakeLists.txt +++ b/doc/CMakeLists.txt @@ -124,9 +124,8 @@ function(_setup_qhelpgenerator_targets _qdocconf_file _html_outputdir) set(_arg_QCH_DIR "${CMAKE_CURRENT_BINARY_DIR}/doc") endif() - _doc_find_program(_qhelpgenerator NAMES qhelpgenerator qhelpgenerator-qt5) - if (_qhelpgenerator STREQUAL "_qhelpgenerator-NOTFOUND") - message(WARNING "No qhelpgenerator binary found: No QCH documentation targets were generated") + if (NOT TARGET Qt5::qhelpgenerator) + message(WARNING "qhelpgenerator missing: No QCH documentation targets were generated") return() endif() @@ -138,7 +137,7 @@ function(_setup_qhelpgenerator_targets _qdocconf_file _html_outputdir) set(_qch_target "qch_docs_${_target}") set(_html_target "html_docs_${_target}") add_custom_target("${_qch_target}" - "${_qhelpgenerator}" "${_html_outputdir}/${_target}.qhp" -o "${_qch_outputdir}/${_target}.qch" + Qt5::qhelpgenerator "${_html_outputdir}/${_target}.qhp" -o "${_qch_outputdir}/${_target}.qch" COMMENT "Build QCH documentation from ${_qdocconf_file}" WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}" VERBATIM