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.

Sign up for GitHub

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

Jump to bottom

(#24893) magic_enum/0.9.6: fixes install dir #24894

Merged
merged 4 commits into from
Aug 13, 2024
Merged

(#24893) magic_enum/0.9.6: fixes install dir #24894

merged 4 commits into from
Aug 13, 2024

Conversation

nine
Copy link
Contributor

@nine nine commented Aug 11, 2024 •
edited
Loading

Summary

Changes to recipe: magic_enum/0.9.6

Motivation

This MR is intended to fix #24893

Details

This MR is intended to fix #24893

@CLAassistant
Copy link

CLAassistant commented Aug 11, 2024 •
edited
Loading

CLA assistant check
All committers have signed the CLA.

@conan-center-bot

This comment has been minimized.

Sign in to view
@nine nine force-pushed the 24893_fixes_magic_enum_install_dir branch from bc3410e to eed8c8f Compare August 11, 2024 11:36
@conan-center-bot

This comment has been minimized.

Sign in to view
SpaceIm
SpaceIm reviewed Aug 11, 2024
View reviewed changes
recipes/magic_enum/all/conanfile.py Outdated
@@ -60,7 +60,7 @@ def build(self):
pass

def package(self):
copy(self, "*", src=os.path.join(self.source_folder, "include"), dst=os.path.join(self.package_folder, "include"))
copy(self, "*", src=os.path.join(self.source_folder, "include/magic_enum"), dst=os.path.join(self.package_folder, "include"))
Copy link
Contributor

@SpaceIm SpaceIm Aug 11, 2024 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
copy(self, "*", src=os.path.join(self.source_folder, "include/magic_enum"), dst=os.path.join(self.package_folder, "include"))
if Version(self.version) < "0.9.4":
src_folder = os.path.join(self.source_folder, "include")
else:
src_folder = os.path.join(self.source_folder, "include", "magic_enum")
copy(self, "*", src=src_folder, dst=os.path.join(self.package_folder, "include"))

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@SpaceIm Thanks for the feedback regarding support of all package versions of magic_enum.

In order to achieve that I've changed the package() method to use the CMake install target.

@nine nine force-pushed the 24893_fixes_magic_enum_install_dir branch from eed8c8f to 48b5714 Compare August 11, 2024 16:53
@conan-center-bot

This comment has been minimized.

Sign in to view
@AbrilRBS AbrilRBS self-assigned this Aug 12, 2024
@conan-center-bot

This comment has been minimized.

Sign in to view
@jcar87
Copy link
Contributor

jcar87 commented Aug 12, 2024

Given that this was already out in the wild, I would probably err on the side of caution and at least for the published versions that had magic_enum/magic_enum.hpp I would support both (that is, copy the files in the package in two places). Otherwise we will break anyone who might have been using it that way. There should (hopefully) be no downsides in this.

@toge
Copy link
Contributor

toge commented Aug 12, 2024

@nine @SpaceIm
Sorry for taking up your time with my mistake.
Thank you for creating the PR that makes it the correct recipe.

@toge toge mentioned this pull request Aug 12, 2024
Closed
3 tasks
@nine
Copy link
Contributor Author

nine commented Aug 12, 2024

@jcar87 according to your suggestion in #24894 (comment) I've added a copy of the includes in the legacy directory for package versions from 0.9.4 to 0.9.6 in ecdbfa0.

@conan-center-bot
Copy link
Collaborator

Conan v1 pipeline ✔️

All green in build 6 (ecdbfa032eca40c3b10725831d85a31d2d639f44):

  • magic_enum/0.9.5:
    All packages built successfully! (All logs)

  • magic_enum/0.9.6:
    All packages built successfully! (All logs)

  • magic_enum/0.8.0:
    All packages built successfully! (All logs)

  • magic_enum/0.9.4:
    All packages built successfully! (All logs)

  • magic_enum/0.9.3:
    All packages built successfully! (All logs)

  • magic_enum/0.8.2:
    All packages built successfully! (All logs)

  • magic_enum/0.9.2:
    All packages built successfully! (All logs)

  • magic_enum/0.9.1:
    All packages built successfully! (All logs)

  • magic_enum/0.8.1:
    All packages built successfully! (All logs)

  • magic_enum/0.9.0:
    All packages built successfully! (All logs)

Conan v2 pipeline ✔️

Note: Conan v2 builds are now mandatory. Please read our discussion about it.

All green in build 6 (ecdbfa032eca40c3b10725831d85a31d2d639f44):

  • magic_enum/0.9.6:
    All packages built successfully! (All logs)

  • magic_enum/0.9.1:
    All packages built successfully! (All logs)

  • magic_enum/0.9.5:
    All packages built successfully! (All logs)

  • magic_enum/0.9.4:
    All packages built successfully! (All logs)

  • magic_enum/0.8.2:
    All packages built successfully! (All logs)

  • magic_enum/0.8.1:
    All packages built successfully! (All logs)

  • magic_enum/0.9.2:
    All packages built successfully! (All logs)

  • magic_enum/0.8.0:
    All packages built successfully! (All logs)

  • magic_enum/0.9.0:
    All packages built successfully! (All logs)

  • magic_enum/0.9.3:
    All packages built successfully! (All logs)

AbrilRBS
AbrilRBS approved these changes Aug 13, 2024
View reviewed changes
Copy link
Member

@AbrilRBS AbrilRBS left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks!

ErniGH
ErniGH approved these changes Aug 13, 2024
View reviewed changes
Copy link
Contributor

@ErniGH ErniGH left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@conan-center-bot conan-center-bot merged commit 2a036dc into conan-io:master Aug 13, 2024
43 checks passed
@nine nine deleted the 24893_fixes_magic_enum_install_dir branch August 13, 2024 12:38
@jcar87 jcar87 mentioned this pull request Nov 19, 2024
Merged
3 tasks
OMGtechy pushed a commit to OMGtechy/conan-center-index that referenced this pull request Dec 31, 2024
@nine @OMGtechy
(conan-io#24894) (conan-io#24893) magic_enum/0.9.6: fixes install dir
ba31f10 
* (conan-io#24893) magic_enum/0.9.6: fixes install dir

* (conan-io#24893) magic_enum/0.9.6: create package using CMake install target

* (conan-io#24893) magic_enum/0.9.6: set src_dir layout method

* (conan-io#24893) magic_enum/0.9.6: add legacy include directory
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@SpaceIm SpaceIm SpaceIm left review comments

@ErniGH ErniGH ErniGH approved these changes

@AbrilRBS AbrilRBS AbrilRBS approved these changes

Assignees

@AbrilRBS AbrilRBS

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

[package] magic_enum/0.9.6: Include path format
8 participants
@nine @CLAassistant @conan-center-bot @jcar87 @toge @AbrilRBS @ErniGH @SpaceIm