-
Notifications
You must be signed in to change notification settings - Fork 214
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
CMake: rename FeatureSummary.cmake to avoid name clashes #953
Merged
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
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).
ahcorde
approved these changes
Feb 27, 2023
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>
mjcarroll
approved these changes
Jun 5, 2023
This is a build-blocking issue on Fedora, and I'd like to consider a backport to Iron. |
Happy to approve if you open. Ran into it with conda as well. |
@Mergifyio backport iron |
✅ Backports have been created
|
mergify bot
pushed a commit
that referenced
this pull request
Jun 5, 2023
* 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)
cottsay
pushed a commit
that referenced
this pull request
Jun 5, 2023
* 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) Co-authored-by: Gökçe Aydos <18174744+goekce@users.noreply.github.com>
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.
Fixes #952
Backports the patch from upstream.