Skip to content
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
merged 3 commits into from
Jun 5, 2023
Merged

CMake: rename FeatureSummary.cmake to avoid name clashes #953

merged 3 commits into from
Jun 5, 2023

Conversation

goekce
Copy link
Contributor

@goekce goekce commented Feb 25, 2023

Fixes #952

Backports the patch from upstream.

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).
@goekce goekce requested a review from ahcorde as a code owner February 25, 2023 07:34
@ahcorde
Copy link
Contributor

ahcorde commented Feb 27, 2023

compiled --packages-above-and-dependencies rviz_ogre_vendor and tests --packages-above rviz_ogre_vendor

  • Linux Build Status
  • Linux-aarch64 Build Status
  • Windows Build Status

@cottsay
Copy link
Member

cottsay commented May 5, 2023

Fresh CI:

  • Linux Build Status
  • Linux-aarch64 Build Status
  • Linux-rhel Build Status
  • Windows Build Status

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>
@cottsay
Copy link
Member

cottsay commented May 6, 2023

With the Windows fix:

  • Linux Build Status
  • Linux-aarch64 Build Status
  • Linux-rhel Build Status
  • Windows Build Status

@cottsay cottsay self-assigned this May 6, 2023
@mjcarroll mjcarroll merged commit 349cb1a into ros2:rolling Jun 5, 2023
@cottsay
Copy link
Member

cottsay commented Jun 5, 2023

This is a build-blocking issue on Fedora, and I'd like to consider a backport to Iron.

@mjcarroll
Copy link
Member

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.

@cottsay
Copy link
Member

cottsay commented Jun 5, 2023

@Mergifyio backport iron

@mergify
Copy link

mergify bot commented Jun 5, 2023

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
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

[rviz_ogre_vendor] ogre-v1.12.10: Unknown CMake command "set_package_properties"
4 participants