Skip to content

cmake: cleanup#1661

Merged
BareosBot merged 23 commits intomasterfrom
dev/joergs/master/cmake-cleanup
Jan 30, 2024
Merged

cmake: cleanup#1661
BareosBot merged 23 commits intomasterfrom
dev/joergs/master/cmake-cleanup

Conversation

@joergsteffens
Copy link
Member

@joergsteffens joergsteffens commented Jan 11, 2024

Thank you for contributing to the Bareos Project!

During PR #1592 it turns out that a number of cmake config settings could be cleaner,
especially when it comes to macOS configuration.
Instead of integrating this in the bugfixing PR, this is now handled in this separate PR.

This PR replaces #1610, as only a PR in https://github.com/bareos/bareos can be used to test the new macOS build workflow handling.

Please check

  • Short description and the purpose of this PR is present above this paragraph
  • Your name is present in the AUTHORS file (optional)

If you have any questions or problems, please give a comment in the PR.

Helpful documentation and best practices

Checklist for the reviewer of the PR (will be processed by the Bareos team)

Make sure you check/merge the PR using devtools/pr-tool to have some simple automated checks run and a proper changelog record added.

General
Source code quality
  • Source code changes are understandable
  • Variable and function names are meaningful
  • Code comments are correct (logically and spelling)
  • Required documentation changes are present and part of the PR

@joergsteffens joergsteffens self-assigned this Jan 11, 2024
@joergsteffens joergsteffens changed the title Dev/joergs/master/cmake cleanup cmake: cleanup Jan 11, 2024
@joergsteffens joergsteffens mentioned this pull request Jan 11, 2024
15 tasks
@joergsteffens joergsteffens force-pushed the dev/joergs/master/cmake-cleanup branch from 9cb7f7b to 10f3235 Compare January 11, 2024 20:57
@joergsteffens joergsteffens requested a review from arogge January 11, 2024 20:58
@joergsteffens joergsteffens marked this pull request as ready for review January 11, 2024 21:02
Copy link
Member

@arogge arogge left a comment

Choose a reason for hiding this comment

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

Looks pretty good overall. I have a few questions and I think you should check if it makes sense to mark some of the cache variables as advanced, so they're hidden from the default-view in ccmake.

@joergsteffens
Copy link
Member Author

@arogge I applied your suggestion and also mark some of the variables as advanced.

@joergsteffens joergsteffens requested a review from arogge January 16, 2024 17:58
Copy link
Member

@arogge arogge 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 taking that long. This looks really, really good!

joergsteffens and others added 18 commits January 30, 2024 17:37
std::find_if is sometimes declared as [[nodiscard]].  As such we
should not ignore its return value.

This commit also slightly refactors the code to remove the use of
std::find_if alltogether.
is_reloading can written to/ read from multiple different threads at
the same time.   As such we cannot just do a test-then-set
approach (even if each of those operations were atomic).  Instead we
need to atomically test _and_ set the flag to actually prevent two
different threads from entering.
The base config path may change on a reload!
exec_program is deprecated since cmake >= 3.0
The travis service is no longer used,
therefore these files are no longer required.
Co-authored-by: Andreas Rogge <andreas.rogge@bareos.com>
joergsteffens and others added 5 commits January 30, 2024 17:37
Mark option, that are normally not manually set as advanced.
Some option are ON by default.
This change marks them as advanced
and removes them from the build descriptions.
@BareosBot BareosBot force-pushed the dev/joergs/master/cmake-cleanup branch from 0e8aa97 to 27ec66c Compare January 30, 2024 17:37
@BareosBot BareosBot merged commit e4466a5 into master Jan 30, 2024
@BareosBot BareosBot deleted the dev/joergs/master/cmake-cleanup branch January 30, 2024 17:37
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.

4 participants