<!-- Kamailio Pull Request Template -->
<!-- IMPORTANT: - for detailed contributing guidelines, read: https://github.com/kamailio/kamailio/blob/master/.github/CONTRIBUTING.md - pull requests must be done to master branch, unless they are backports of fixes from master branch to a stable branch - backports to stable branches must be done with 'git cherry-pick -x ...' - code is contributed under BSD for core and main components (tm, sl, auth, tls) - code is contributed GPLv2 or a compatible license for the other components - GPL code is contributed with OpenSSL licensing exception -->
#### Pre-Submission Checklist <!-- Go over all points below, and after creating the PR, tick all the checkboxes that apply --> <!-- All points should be verified, otherwise, read the CONTRIBUTING guidelines from above--> <!-- If you're unsure about any of these, don't hesitate to ask on sr-dev mailing list --> - [x] Commit message has the format required by CONTRIBUTING guide - [ ] Commits are split per component (core, individual modules, libs, utils, ...) - [x] Each component has a single commit (if not, squash them into one commit) - [x] No commits to README files for modules (changes must be done to docbook files in `doc/` subfolder, the README file is autogenerated)
#### Type Of Change - [ ] Small bug fix (non-breaking change which fixes an issue) - [ ] New feature (non-breaking change which adds new functionality) - [ ] Breaking change (fix or feature that would change existing functionality)
#### Checklist: <!-- Go over all points below, and after creating the PR, tick the checkboxes that apply --> - [ ] PR should be backported to stable branches - [ ] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number)
#### Description <!-- Describe your changes in detail -->
You can view, comment on, or merge this pull request online at:
https://github.com/kamailio/kamailio/pull/4192
-- Commit Summary --
* cmake: Alter some of cmake-format options * cmake: Fix formatting according to cmake-format config file.
-- File Changes --
M CMakeLists.txt (18) M cmake/BuildType.cmake (8) M cmake/cmake-format.py (4) M cmake/compiler-specific.cmake (24) M cmake/defs.cmake (29) M cmake/groups.cmake (45) M cmake/modules-docs.cmake (94) M cmake/modules/FindBerkeleyDB.cmake (60) M cmake/modules/FindErlang.cmake (52) M cmake/modules/FindLdap.cmake (32) M cmake/modules/FindLibev.cmake (4) M cmake/modules/FindLibfreeradiusClient.cmake (21) M cmake/modules/FindMariaDBClient.cmake (3) M cmake/modules/FindMySQL.cmake (114) M cmake/modules/FindNETSNMP.cmake (15) M cmake/modules/FindOracle.cmake (11) M cmake/modules/FindRadius.cmake (6) M cmake/os-specific/darwin.cmake (38) M cmake/os-specific/dragonfly.cmake (9) M cmake/os-specific/freebsd.cmake (3) M cmake/os-specific/linux.cmake (9) M src/CMakeLists.txt (44) M src/core/CMakeLists.txt (16) M src/modules/CMakeLists.txt (55) M src/modules/app_perl/CMakeLists.txt (17) M src/modules/auth_radius/CMakeLists.txt (7) M src/modules/db2_ldap/CMakeLists.txt (3) M src/modules/db_berkeley/CMakeLists.txt (3) M src/modules/dnssec/CMakeLists.txt (5) M src/modules/kazoo/CMakeLists.txt (3) M src/modules/nghttp2/CMakeLists.txt (5) M src/modules/nsq/CMakeLists.txt (5) M src/modules/phonenum/CMakeLists.txt (16) M src/modules/ruxc/CMakeLists.txt (3) M src/modules/sctp/CMakeLists.txt (6) M src/modules/secsipid_proc/CMakeLists.txt (3) M src/modules/snmpstats/CMakeLists.txt (3) M src/modules/tls/CMakeLists.txt (29) M src/modules/tlsa/CMakeLists.txt (11) M src/modules/xhttp_pi/CMakeLists.txt (7) M utils/CMakeLists.txt (6) M utils/db_berkeley/CMakeLists.txt (3) M utils/kamcmd/CMakeLists.txt (26) M utils/kamctl/CMakeLists.txt (161)
-- Patch Links --
https://github.com/kamailio/kamailio/pull/4192.patch https://github.com/kamailio/kamailio/pull/4192.diff
henningw left a comment (kamailio/kamailio#4192)
Any comments on this change? Its ok to do it as one single commit for all modules, or do you prefer to have over 200 individual commits?
linuxmaniac left a comment (kamailio/kamailio#4192)
Can you please rebase first. I would like to check the recent changes in cmake-format checks in GitHub PR action
@xkaraman pushed 2 commits.
0d86f578fad9b11a0f25dd560a109b8606442c47 cmake: Alter some of cmake-format options bc412650f6ab0dff1d72f0e16057502a38b1b539 cmake: Fix formatting according to cmake-format config file.
xkaraman left a comment (kamailio/kamailio#4192)
@linuxmaniac rebased
linuxmaniac left a comment (kamailio/kamailio#4192)
have over 200 individual commits?
I don't mind since this is just formatting changes
xkaraman left a comment (kamailio/kamailio#4192)
i am not sure but i think the PR action check was not honored before. i can see in the config file that `dangle_parens = True` was set already but the PR checks didn't fail on older PRs. (I am quite sure there were a cmake PRs before this change with the wrong format)
linuxmaniac left a comment (kamailio/kamailio#4192)
@xkaraman can you please rebase again
@xkaraman pushed 2 commits.
5ac1ab0e8cc621e257f57209d1ee0e689fbf6692 cmake: Alter some of cmake-format options e007a3d24972761c182c0b47de4fb73aca4c560a cmake: Fix formatting according to cmake-format config file.
linuxmaniac left a comment (kamailio/kamailio#4192)
Hope your new way with script it does take into account the config file.
What do you mean?
xkaraman left a comment (kamailio/kamailio#4192)
As i said before:
i am not sure but i think the PR action check was not honored before. i can see in the config file that `dangle_parens = True` was set already but the PR checks didn't fail on older PRs. (I am quite sure there were a cmake PRs before this change with the wrong format).
EDIT: I just saw you made some changes last week regarding the `cmake-format` with some script. i was not referring to this but to the older way of checking, just to be clear. Hope your new way with script it does take into account the config file.
I think this is the first PR regarding CMake after you have introduced the scripts. Before it was done directly (I guess?) but it seemed that it was not honoring the config file (realised this due to config already have the `dangle_parens = True` but the format in files was not like that) .
The script check now seems to pass, but let me push a wrongly formatted file to verify it.
Cheers, Xenofon
@xkaraman pushed 1 commit.
32bb490fa2420ab2575e518ffb6da433534a0d80 cmake: wrong format check
xkaraman left a comment (kamailio/kamailio#4192)
As you can see pushing a wrongly formatted file like `kamcmd/CMakeLists.txt` did NOT trigger a failure regarding its format.
`cmake-format.py` in master has the check enabled (even before this PR) that it should trigger fail the check.
-
Henning Westerholt -
Victor Seva
-
Xenofon Karamanos