diff options
| author | Pino Toscano <pino@kde.org> | 2018-11-17 08:57:09 +0100 |
|---|---|---|
| committer | Pino Toscano <pino@kde.org> | 2018-11-18 09:57:20 +0100 |
| commit | 96d169b87292d935646b1924952829b0f4d5d669 (patch) | |
| tree | a24bb5e7b5eaa3c2bfb4f07b7aae12d3512fde43 /find-modules | |
| parent | d42cc5dd7c4e78db16d1f4f0c17f141ad97b4cf4 (diff) | |
| download | extra-cmake-modules-96d169b87292d935646b1924952829b0f4d5d669.tar.gz extra-cmake-modules-96d169b87292d935646b1924952829b0f4d5d669.tar.bz2 | |
FindQHelpGenerator: try to find Qt5Help instead of Qt5Core
Summary:
The Qt5Help CMake modules contain the Qt5::qhelpgenerator target, so
look for that instead of Qt5Core. Otherwise, the Qt5::qhelpgenerator
is available only if Qt5Help was searched previously (which does not
happen often).
Using the Qt5::qhelpgenerator is more reliable than the search for the
qhelpgenerator executable based on the qmake path.
Test Plan:
build some framework with -DBUILD_QCH=ON, and notice that
the right path of qhelpgenerator is found directly with the
Qt5::qhelpgenerator target.
Reviewers: kossebau
Reviewed By: kossebau
Subscribers: kde-frameworks-devel, kde-buildsystem
Tags: #frameworks, #build_system
Differential Revision: https://phabricator.kde.org/D16938
Diffstat (limited to 'find-modules')
| -rw-r--r-- | find-modules/FindQHelpGenerator.cmake | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/find-modules/FindQHelpGenerator.cmake b/find-modules/FindQHelpGenerator.cmake index 50aef27b..272e5877 100644 --- a/find-modules/FindQHelpGenerator.cmake +++ b/find-modules/FindQHelpGenerator.cmake @@ -33,7 +33,7 @@ # THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #============================================================================= -find_package(Qt5Core QUIET) +find_package(Qt5Help QUIET) if (TARGET Qt5::qhelpgenerator) get_target_property(QHelpGenerator_EXECUTABLE Qt5::qhelpgenerator LOCATION) else() |