D6249: FindQHelpGenerator: avoid picking up Qt4 version
palimaka added a comment. Sorry for the delay, I was away. Thanks for pushing! REPOSITORY R240 Extra CMake Modules REVISION DETAIL https://phabricator.kde.org/D6249 To: palimaka, #frameworks, kossebau, kfunk Cc: alexeymin, asturmlechner, #build_system
D6249: FindQHelpGenerator: avoid picking up Qt4 version
This revision was automatically updated to reflect the committed changes. Closed by commit R240:a13f1dcd2e7b: FindQHelpGenerator: avoid picking up Qt4 version (authored by palimaka, committed by kossebau). REPOSITORY R240 Extra CMake Modules CHANGES SINCE LAST UPDATE https://phabricator.kde.org/D6249?vs=15514=15796 REVISION DETAIL https://phabricator.kde.org/D6249 AFFECTED FILES find-modules/FindQHelpGenerator.cmake To: palimaka, #frameworks, kossebau, kfunk Cc: alexeymin, asturmlechner, #build_system
D6249: FindQHelpGenerator: avoid picking up Qt4 version
kossebau added a comment. So pushing now myself, so this todo can be checked off :) REPOSITORY R240 Extra CMake Modules BRANCH master REVISION DETAIL https://phabricator.kde.org/D6249 To: palimaka, #frameworks, kossebau, kfunk Cc: alexeymin, asturmlechner, #build_system
D6249: FindQHelpGenerator: avoid picking up Qt4 version
kossebau added a comment. @palimaka You have KDE push rights, correct? Will you have time this week to push this, or do you want someone/me to do that for you? Would be good to have this in as soon as possible, given tagging release is <2 weeks away :) REPOSITORY R240 Extra CMake Modules BRANCH master REVISION DETAIL https://phabricator.kde.org/D6249 To: palimaka, #frameworks, kossebau, kfunk Cc: alexeymin, asturmlechner, #build_system
D6249: FindQHelpGenerator: avoid picking up Qt4 version
kossebau accepted this revision.
kossebau added a comment.
This revision is now accepted and ready to land.
Ah, PEBKAC, I only added NO_DEFAULT_PATH to the code when manually applying
the patch. Fixing also PATH->PATHS improved things, and the executable now is
found in ${_path}.
No more objection from my side :)
REPOSITORY
R240 Extra CMake Modules
BRANCH
master
REVISION DETAIL
https://phabricator.kde.org/D6249
To: palimaka, #frameworks, kossebau, kfunk
Cc: alexeymin, asturmlechner, #build_system
D6249: FindQHelpGenerator: avoid picking up Qt4 version
kossebau requested changes to this revision. kossebau added a comment. This revision now requires changes to proceed. Thanks for the fix. Sadly this fails on my openSUSE TW system with system Qt5 packages, where _path is /usr/lib64/qt5/bin, and while that dir has both qhelpgenerator-qt5 and qhelpgenerator files, they are links pointing to the actual executable file located at /usr/bin/qhelpgenerator-qt5 lrwxrwxrwx 1 root root 31 28. Mai 12:40 /usr/lib64/qt5/bin/qhelpgenerator-qt5 -> ../../../bin/qhelpgenerator-qt5 lrwxrwxrwx 1 root root 31 28. Mai 12:40 /usr/lib64/qt5/bin/qhelpgenerator -> ../../../bin/qhelpgenerator-qt5 Still had no time to investigate some more why this fails. (Actually it is not such an issue if the Qt4 version is used, it's working as well. But still using the latest version of qhelpgenerator, as provided by qt5, feels better -> "newer is better!") REPOSITORY R240 Extra CMake Modules REVISION DETAIL https://phabricator.kde.org/D6249 To: palimaka, #frameworks, kossebau, kfunk Cc: alexeymin, asturmlechner, #build_system
D6249: FindQHelpGenerator: avoid picking up Qt4 version
kfunk accepted this revision. This revision is now accepted and ready to land. REPOSITORY R240 Extra CMake Modules BRANCH master REVISION DETAIL https://phabricator.kde.org/D6249 To: palimaka, #frameworks, kossebau, kfunk Cc: alexeymin, asturmlechner, #build_system
D6249: FindQHelpGenerator: avoid picking up Qt4 version
palimaka updated this revision to Diff 15514. palimaka added a comment. Fix indentation. REPOSITORY R240 Extra CMake Modules CHANGES SINCE LAST UPDATE https://phabricator.kde.org/D6249?vs=15512=15514 BRANCH master REVISION DETAIL https://phabricator.kde.org/D6249 AFFECTED FILES find-modules/FindQHelpGenerator.cmake To: palimaka, #frameworks, kossebau Cc: asturmlechner, #build_system
D6249: FindQHelpGenerator: avoid picking up Qt4 version
palimaka added a reviewer: kossebau. REPOSITORY R240 Extra CMake Modules REVISION DETAIL https://phabricator.kde.org/D6249 To: palimaka, #frameworks, kossebau Cc: asturmlechner, #build_system
D6249: FindQHelpGenerator: avoid picking up Qt4 version
palimaka created this revision. Restricted Application added projects: Frameworks, Build System. Restricted Application added a subscriber: Build System. REVISION 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. REPOSITORY R240 Extra CMake Modules BRANCH master REVISION DETAIL https://phabricator.kde.org/D6249 AFFECTED FILES find-modules/FindQHelpGenerator.cmake To: palimaka, #frameworks Cc: #build_system
