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 modules #23

Merged
merged 26 commits into from
Mar 31, 2021
Merged

CMake modules #23

merged 26 commits into from
Mar 31, 2021

Conversation

gnosek
Copy link
Contributor

@gnosek gnosek commented Mar 26, 2021

What type of PR is this?

Uncomment one (or more) /kind <> lines:

/kind bug

/kind cleanup

/kind design

/kind documentation

/kind failing-test

/kind feature

Any specific area of the project related to this PR?

Uncomment one (or more) /area <> lines:

/area build

/area driver-kmod

/area driver-ebpf

/area libscap

/area libsinsp

/area tests

What this PR does / why we need it:

This PR wraps libscap, libsinsp and all dependencies in CMake modules. It makes both libraries more self-contained, while still allowing to override any dependencies (by writing your own .cmake and putting it in the search path).

Special notes for your reviewer:

It probably looks best when reviewed commit by commit. It also clearly conflicts with #14 so we need to decide which one should go in first.

draios/sysdig#1749 is the companion sysdig PR.

Does this PR introduce a user-facing change?:

NONE

gnosek added 13 commits March 29, 2021 13:51
Signed-off-by: Grzegorz Nosek <grzegorz.nosek@sysdig.com>
Signed-off-by: Grzegorz Nosek <grzegorz.nosek@sysdig.com>
Signed-off-by: Grzegorz Nosek <grzegorz.nosek@sysdig.com>
Signed-off-by: Grzegorz Nosek <grzegorz.nosek@sysdig.com>
Signed-off-by: Grzegorz Nosek <grzegorz.nosek@sysdig.com>
Signed-off-by: Grzegorz Nosek <grzegorz.nosek@sysdig.com>
Signed-off-by: Grzegorz Nosek <grzegorz.nosek@sysdig.com>
Signed-off-by: Grzegorz Nosek <grzegorz.nosek@sysdig.com>
Signed-off-by: Grzegorz Nosek <grzegorz.nosek@sysdig.com>
Signed-off-by: Grzegorz Nosek <grzegorz.nosek@sysdig.com>
Signed-off-by: Grzegorz Nosek <grzegorz.nosek@sysdig.com>
Signed-off-by: Grzegorz Nosek <grzegorz.nosek@sysdig.com>
Signed-off-by: Grzegorz Nosek <grzegorz.nosek@sysdig.com>
gnosek added 4 commits March 29, 2021 20:25
The run-unit-tests target must remain at the top level
for the test suite to pick it up.

Signed-off-by: Grzegorz Nosek <grzegorz.nosek@sysdig.com>
Signed-off-by: Grzegorz Nosek <grzegorz.nosek@sysdig.com>
Signed-off-by: Grzegorz Nosek <grzegorz.nosek@sysdig.com>
Signed-off-by: Grzegorz Nosek <grzegorz.nosek@sysdig.com>
gnosek added 9 commits March 29, 2021 20:26
Signed-off-by: Grzegorz Nosek <grzegorz.nosek@sysdig.com>
Signed-off-by: Grzegorz Nosek <grzegorz.nosek@sysdig.com>
Signed-off-by: Grzegorz Nosek <grzegorz.nosek@sysdig.com>
No functional changes, just flattening the nested structure
and unifying variable names across WIN32/others

Signed-off-by: Grzegorz Nosek <grzegorz.nosek@sysdig.com>
Signed-off-by: Grzegorz Nosek <grzegorz.nosek@sysdig.com>
Signed-off-by: Grzegorz Nosek <grzegorz.nosek@sysdig.com>
This is not imported (or owned) by libsinsp/scap since it's not
really specific to either lib and in theory they should work fine
without the module.

Signed-off-by: Grzegorz Nosek <grzegorz.nosek@sysdig.com>
Signed-off-by: Grzegorz Nosek <grzegorz.nosek@sysdig.com>
Signed-off-by: Grzegorz Nosek <grzegorz.nosek@sysdig.com>
Copy link
Contributor

@fntlnz fntlnz left a comment

Choose a reason for hiding this comment

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

LGTM

I noticed that we still have download.sysdig.com around, I feel like this PR is complete because it's a refactoring and changing those can be done in another PR later.

I tested various combinations (the ones I usually work with) with Ninja and make and everything worked as expected.

Good job @gnosek !

@poiana
Copy link
Contributor

poiana commented Mar 30, 2021

LGTM label has been added.

Git tree hash: b8a8a078cbff53ac28270a9ff111ae53213033b7

@poiana
Copy link
Contributor

poiana commented Mar 31, 2021

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: fntlnz, leogr

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 639c5a1 into falcosecurity:master Mar 31, 2021
@gnosek gnosek deleted the cmake-modules branch March 31, 2021 08:17
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants