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

make CMake's version config file architecture-independent #1746

Merged
merged 2 commits into from
Apr 19, 2020
Merged

make CMake's version config file architecture-independent #1746

merged 2 commits into from
Apr 19, 2020

Conversation

uhoreg
Copy link
Contributor

@uhoreg uhoreg commented Sep 11, 2019

Fixes #1697. In short, CMake's write_basic_package_version_file by default creates a file that checks whether it is being called on a 32- or 64-bit architecture, and will fail if it is called on a different bit size than what it was built on, even though that doesn't affect the JSON library, since it is header-only. This replaces the automatically-generated file with a file that checks the version requirement, but does not check the word size. (It is essentially CMake's file, but with the word size check removed.)

@coveralls
Copy link

coveralls commented Sep 11, 2019 •
edited
Loading

Coverage Status

Coverage remained the same at 100.0% when pulling cade804 on uhoreg:cmake_arch_indep into 06ccd43 on nlohmann:develop.

@stale
Copy link

stale bot commented Oct 11, 2019

This issue has been automatically marked as stale because it has not had recent activity. It will be closed if no further activity occurs. Thank you for your contributions.

@stale stale bot added the state: stale the issue has not been updated in a while and will be closed automatically soon unless it is updated label Oct 11, 2019
@t-b
Copy link
Contributor

t-b commented Oct 15, 2019 •
edited
Loading

@uhoreg @nlohmann Is that good to go? I think I'm seeing some fallout of not having that in #1780.

Edit: No, I just had to adapt to new cmake flags wanting the architecture separately.

@stale stale bot removed the state: stale the issue has not been updated in a while and will be closed automatically soon unless it is updated label Oct 15, 2019
@stale
Copy link

stale bot commented Nov 16, 2019

This issue has been automatically marked as stale because it has not had recent activity. It will be closed if no further activity occurs. Thank you for your contributions.

@stale stale bot added the state: stale the issue has not been updated in a while and will be closed automatically soon unless it is updated label Nov 16, 2019
@nlohmann nlohmann removed the state: stale the issue has not been updated in a while and will be closed automatically soon unless it is updated label Nov 18, 2019
@stale
Copy link

stale bot commented Dec 16, 2019

This issue has been automatically marked as stale because it has not had recent activity. It will be closed if no further activity occurs. Thank you for your contributions.

@stale stale bot added the state: stale the issue has not been updated in a while and will be closed automatically soon unless it is updated label Dec 16, 2019
@nlohmann nlohmann removed the state: stale the issue has not been updated in a while and will be closed automatically soon unless it is updated label Dec 20, 2019
@stale
Copy link

stale bot commented Jan 15, 2020

This issue has been automatically marked as stale because it has not had recent activity. It will be closed if no further activity occurs. Thank you for your contributions.

@stale stale bot added the state: stale the issue has not been updated in a while and will be closed automatically soon unless it is updated label Jan 15, 2020
@stale stale bot closed this Jan 22, 2020
@uhoreg
Copy link
Contributor Author

uhoreg commented Jan 23, 2020

@nlohmann can you re-open this please (or even better, merge it. ;) )

@nlohmann nlohmann reopened this Jan 25, 2020
@stale stale bot removed the state: stale the issue has not been updated in a while and will be closed automatically soon unless it is updated label Jan 25, 2020
@stale
Copy link

stale bot commented Feb 24, 2020

This issue has been automatically marked as stale because it has not had recent activity. It will be closed if no further activity occurs. Thank you for your contributions.

@stale stale bot added the state: stale the issue has not been updated in a while and will be closed automatically soon unless it is updated label Feb 24, 2020
@uhoreg
Copy link
Contributor Author

uhoreg commented Feb 24, 2020

not stale

@stale stale bot removed the state: stale the issue has not been updated in a while and will be closed automatically soon unless it is updated label Feb 24, 2020
nlohmann
nlohmann requested changes Mar 19, 2020
View reviewed changes
Copy link
Owner

@nlohmann nlohmann left a comment

Choose a reason for hiding this comment

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

Sorry for the long delay. It would be great if you could address my comments, then this issue would be finally fixed.

CMakeLists.txt Show resolved Hide resolved
cmake/nlohmann_jsonConfigVersion.cmake.in Show resolved Hide resolved
@uhoreg uhoreg requested a review from nlohmann April 17, 2020 19:54
@uhoreg
Copy link
Contributor Author

uhoreg commented Apr 17, 2020

I've added comments as requested.

nlohmann
nlohmann approved these changes Apr 19, 2020
View reviewed changes
Copy link
Owner

@nlohmann nlohmann left a comment

Choose a reason for hiding this comment

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

Looks good to me.

@nlohmann nlohmann merged commit be13760 into nlohmann:develop Apr 19, 2020
@nlohmann
Copy link
Owner

Thanks!

@nlohmann nlohmann self-assigned this Apr 19, 2020
@nlohmann nlohmann added this to the Release 3.8.0 milestone Apr 19, 2020
@nlohmann nlohmann mentioned this pull request Apr 19, 2020
Closed
@nlohmann
Copy link
Owner

nlohmann commented Apr 19, 2020 •
edited
Loading

🔖 Release item

This issue/PR will be part of the next release of the library. This template helps preparing the release notes.

Type

  • ✨ New Feature
  • 🐛 Bug Fix
  • ⚡️ Improvement
  • 🔨 Further Change
  • 🔥 Deprecated function

Description

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@nlohmann nlohmann nlohmann approved these changes

Assignees

@nlohmann nlohmann

Labels
release item: 🔨 further change
Projects
None yet
Milestone
Release 3.8.0
Development

Successfully merging this pull request may close these issues.

CMake version config file is architecture-dependent
4 participants
@uhoreg @coveralls @t-b @nlohmann