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

chore(build): allow usage of non-bundled nlohmann-json #2947

Conversation

federico-sysdig
Copy link
Contributor

What type of PR is this?
/kind cleanup

Any specific area of the project related to this PR?
/area build

What this PR does / why we need it:
Library nlohmann-json was always downloaded as part of the build and didn't follow the choice bundled/non-bundled of the other ones. This PR adds the CMake variable USE_BUNDLED_NLOHMANN_JSON to allow just that.
Some improvements in the way the library is referenced have also been applied to follow a more modern CMake usage: typically using find_package to look for the library and linking it with the CMake alias nlohmann_json::nlohmann_json that the library maintainers have chosen.

Which issue(s) this PR fixes:
Fixes #

Special notes for your reviewer:

Does this PR introduce a user-facing change?:

NONE

Signed-off-by: Federico Aponte <federico.aponte@sysdig.com>
Signed-off-by: Federico Aponte <federico.aponte@sysdig.com>
@federico-sysdig federico-sysdig force-pushed the build-allow-non-bundled-nlohmann-json branch from 49c5cf7 to b2a59e6 Compare December 6, 2023 10:12
Copy link
Member

@Andreagit97 Andreagit97 left a comment

Choose a reason for hiding this comment

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

/approve

@poiana
Copy link
Contributor

poiana commented Dec 11, 2023

LGTM label has been added.

Git tree hash: 563457448b909b575c8e29886d8843c85d697565

@Andreagit97 Andreagit97 added this to the 0.37.0 milestone Dec 11, 2023
Copy link
Contributor

@FedeDP FedeDP left a comment

Choose a reason for hiding this comment

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

/approve

@poiana
Copy link
Contributor

poiana commented Dec 11, 2023

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: Andreagit97, FedeDP, federico-sysdig

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@poiana poiana merged commit e427c80 into falcosecurity:master Dec 11, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
Archived in project
Development

Successfully merging this pull request may close these issues.

4 participants