FindQHelpGenerator: try to find Qt5Help instead of Qt5Core
ClosedPublic

Authored by pino on Nov 17 2018, 8:01 AM.

Details

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.

Diff Detail

Repository
R240 Extra CMake Modules
Branch
find-qhelpgenerator-target
Lint
No Linters Available
Unit
No Unit Test Coverage
Build Status
Buildable 5010
Build 5028: arc lint + arc unit
pino created this revision.Nov 17 2018, 8:01 AM
Restricted Application added projects: Frameworks, Build System. · View Herald TranscriptNov 17 2018, 8:01 AM
Restricted Application added subscribers: kde-buildsystem, kde-frameworks-devel. · View Herald Transcript
pino requested review of this revision.Nov 17 2018, 8:01 AM
kossebau accepted this revision.Nov 17 2018, 4:24 PM

Good find. No idea why it was not like this from the start.

Untested (besides grepping my local Qt 5.11 CMake Config files to confirm myself that's really the place where the imported target is added), but given you tested pretty sure this is a proper fix. Thanks.

This revision is now accepted and ready to land.Nov 17 2018, 4:24 PM
pino closed this revision.Nov 18 2018, 8:57 AM