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: disable_all_modules support #2647

Merged
merged 4 commits into from
Mar 28, 2019

Conversation

furiel
Copy link
Collaborator

@furiel furiel commented Mar 26, 2019

  • If -DDISABLE_ALL_MODULES=yes specified for cmake, all switchable modules are disabled by default. One can still override specific modules by: -DDISABLE_ALL_MODULES=yes -DENABLE_PYTHON=yes. The order of definitions do not matter.
  • Fixed a bug, when -DENABLE_IPV6=no resulted in compile error in a unit test.
  • Fixed a bug when json unit tests were still tried to compiled even without json support.
  • Removed -DENABLE_BASICFUNCS, as it causes compile error in some unit tests, it is not switchable in autotools, and does not have any external dependencies.

With `-DENABLE_IPV6=no`, this unit test does not compile.

Signed-off-by: Antal Nemes <antal.nemes@balabit.com>
Signed-off-by: Antal Nemes <antal.nemes@balabit.com>
This does not work: as there are other test that depend on it, but the
guard is missing around them. In autotools, this module is not
switchable. So we get closer to the autotools version. Basicfuncs has
no external dependency, and we typically make modules modules
switchable, if they have such dependency.

Signed-off-by: Antal Nemes <antal.nemes@balabit.com>
@kira-syslogng
Copy link
Contributor

Build SUCCESS

bazsi
bazsi previously approved these changes Mar 26, 2019
Copy link
Collaborator

@bazsi bazsi left a comment

Choose a reason for hiding this comment

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

This looks good to me.

@furiel furiel changed the title cmake: disable_all_modules support [WIP] cmake: disable_all_modules support Mar 26, 2019
-DDISABLE_ALL_MODULES=yes will disable all switchable modules

Signed-off-by: Antal Nemes <antal.nemes@balabit.com>
@furiel furiel changed the title [WIP] cmake: disable_all_modules support cmake: disable_all_modules support Mar 26, 2019
@kira-syslogng
Copy link
Contributor

Build SUCCESS

Copy link
Collaborator

@Kokan Kokan left a comment

Choose a reason for hiding this comment

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

thanks

@lbudai lbudai merged commit b1620af into syslog-ng:master Mar 28, 2019
@furiel furiel deleted the cmake-disable-all-modules branch November 5, 2019 11:41
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants