CMake: rename FeatureSummary.cmake to avoid name clashes (backport #953) #988
Conversation
This file contains 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
![mergify[bot]](https://avatars.githubusercontent.com/in/10562?s=60&v=4){kind=small}
* CMake: rename FeatureSummary.cmake to avoid name clashes According to OGRECave/ogre#2381: ``` The reason is FeatureSummary is a CMake's module, and /usr/lib64/cmake/Qt6Gui/Qt6GuiDependencies.cmake has a line include(FeatureSummary). Since you have FeatureSummary.cmake in your project, it gets loaded instead of /usr/share/cmake/Modules/FeatureSummary.cmake. The solution is simple: just rename FeatureSummary.cmake in your project. ``` Backports the [patch from upstream](OGRECave/ogre@e34ef06). * Explicitly rename files The version of `patch` available in chocolatey in Windows is ancient and doesn't support git-style renaming of files, so we'll need to do it explicitly (for now). Signed-off-by: Scott K Logan <logans@cottsay.net> --------- Signed-off-by: Scott K Logan <logans@cottsay.net> Co-authored-by: goekce <git2022@aydos.de> Co-authored-by: Scott K Logan <logans@cottsay.net> (cherry picked from commit 349cb1a)
|
mjcarroll
approved these changes
Jun 5, 2023
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.
This is an automatic backport of pull request #953 done by Mergify.
Mergify commands and options
More conditions and actions can be found in the documentation.
You can also trigger Mergify actions by commenting on this pull request:
@Mergifyio refreshwill re-evaluate the rules@Mergifyio rebasewill rebase this PR on its base branch@Mergifyio updatewill merge the base branch into this PR@Mergifyio backport <destination>will backport this PR on<destination>branchAdditionally, on Mergify dashboard you can:
Finally, you can contact us on https://mergify.com