Repository navigation
build: find Qt and Sparkle the way Craft and Conan both provide them - #12694
Draft
oc-tmueller wants to merge 3 commits into
Draft
oc-tmueller wants to merge 3 commits into
oc-tmueller wants to merge 3 commits into
Conversation
… way Conan's Qt is one Qt6 package with components: it has no separate Qt6LinguistTools config, no versionless Qt::qmake alias, and puts only include/ (not include/QtQmlIntegration) on the path for the header-only QmlIntegration module. Use the forms that both Conan's and Qt's own CMake files provide: - find_package(Qt6 COMPONENTS LinguistTools), as Qt documents it; - Qt6::qmake, read with LOCATION: Qt's own exported target sets only IMPORTED_LOCATION_<CONFIG>, so IMPORTED_LOCATION would be NOTFOUND, while LOCATION resolves either form on an imported target; - <QtQmlIntegration/...>, as account.h and accountmanager.h already do. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
The Conan package's sparkle-config.cmake defines the target sparkle::sparkle and Sparkle_FOUND, but not FindSparkle's SPARKLE_FOUND and SPARKLE_LIBRARY, so a Conan build silently left out the Sparkle updater. FindSparkle now defines the same target, and the updater checks for it. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
|
Thanks for opening this pull request! The maintainers of this repository would appreciate it if you would create a changelog item based on your changes. |
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Split out of #12689, which adds the Conan dependency configuration. These are the only changes there to the client's own build files; on their own they don't depend on Conan and must keep the Craft build green.
Conan's Qt and Sparkle packages expose different CMake names than Craft's. This switches to forms both provide:
find_package(Qt6 COMPONENTS LinguistTools)instead of the separateQt6LinguistToolspackage.Qt6::qmakeread withLOCATION. Conan has no versionlessQt::qmake, and Qt's own target sets onlyIMPORTED_LOCATION_<CONFIG>.<QtQmlIntegration/QtQmlIntegration>inaccountstate.handspace.h, asaccount.handaccountmanager.halready include it. Conan puts onlyinclude/on the path.FindSparkle.cmakedefines thesparkle::sparkletarget that Conan's package provides, and the updater checks for and links that target instead ofSPARKLE_FOUND/SPARKLE_LIBRARY. Before this, a Conan build silently left the Sparkle updater out.#12689 depends on this PR and drops these commits once it merges.
🤖 Generated with Claude Code