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

Add pkg-config file #2253

Merged
merged 2 commits into from
Jul 9, 2020
Merged

Add pkg-config file #2253

merged 2 commits into from
Jul 9, 2020

Conversation

ericonr
Copy link
Contributor

@ericonr ericonr commented Jul 8, 2020

Add pkg-config generation to the CMake build system, functionally the same as the pkg-config generated by Meson. This PR is picking up on the work from #1701 .

Pull request checklist

@ericonr ericonr requested a review from nlohmann as a code owner July 8, 2020 20:18
@coveralls
Copy link

coveralls commented Jul 8, 2020 •
edited
Loading

Coverage Status

Coverage remained the same at 100.0% when pulling 251fce8 on ericonr:pkgconf into 0306525 on nlohmann:develop.

nlohmann
nlohmann requested changes Jul 9, 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.

Could you please rename the file to pkg-config.pc.in, put it into the cmake folder, and adjust the CMakeLists.txt accordingly?

palmer-dabbelt and others added 2 commits July 9, 2020 03:59
@palmer-dabbelt @ericonr
cmake: Generate and install a pkg-config file.
c7d18c1 
The meson builds install a pkg-config file, but the cmake builds don't.
This adds a pkg-config file to the cmake builds that is functionally
equivalent to the one generated from meson.
@ericonr
README: add explanation on how to use pkg-config.
251fce8
@ericonr
Copy link
Contributor Author

ericonr commented Jul 9, 2020

Done! Would you prefer I used CMAKE_CURRENT_SOURCE_DIR or PROJECT_SOURCE_DIR ?

@nlohmann
Copy link
Owner

nlohmann commented Jul 9, 2020

I think CMAKE_CURRENT_SOURCE_DIR is less surprising.

nlohmann
nlohmann approved these changes Jul 9, 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 self-assigned this Jul 9, 2020
@nlohmann nlohmann added this to the Release 3.8.1 milestone Jul 9, 2020
@nlohmann nlohmann merged commit 75d5d05 into nlohmann:develop Jul 9, 2020
@nlohmann
Copy link
Owner

nlohmann commented Jul 9, 2020

Thanks!

@nlohmann
Copy link
Owner

nlohmann commented Jul 9, 2020

🔖 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

@nlohmann
Copy link
Owner

FYI: The DESCRIPTION keyword for project() was only added in CMake 3.9. I will revert that part as we only required CMake 3.1.

@ericonr
Copy link
Contributor Author

ericonr commented Jul 10, 2020

I see, thanks!

@eli-schwartz eli-schwartz mentioned this pull request Jul 27, 2020
Merged
@eli-schwartz
Copy link
Contributor

Somehow this managed to completely break make install when running tests, see #2318

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.9.0
Development

Successfully merging this pull request may close these issues.

None yet
5 participants
@ericonr @coveralls @nlohmann @eli-schwartz @palmer-dabbelt