Skip to content

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Jul 17, 2025

🦟 Bug fix

Follow up of #1491 . #1491 enable the compilation of bindings separately from the main library, but does not permit to set BUILD_TESTING:BOOL=ON in those binding-only builds.

Summary

This PR permits to pass -DBUILD_TESTING:BOOL=ON in bindings-only builds, by:

  • Ensuring that ${PROJECT_BINARY_DIR}/include/test_config.hh is generated also in bindings-only builds,
  • Use CMAKE_CURRENT_SOURCE_DIR instead of CMAKE_SOURCE_DIR when creating the tests, as the CMAKE_CURRENT_SOURCE_DIR variable have a consistent value that is not influenced on which is the root directory of the CMake build.

Checklist

  • Signed all commits for DCO
  • Added tests
  • Updated documentation (as needed)
  • Updated migration guide (as needed)
  • Consider updating Python bindings (if the library has them)
  • codecheck passed (See contributing)
  • All tests passed (See test coverage)
  • While waiting for a review on your PR, please help review another open pull request to support the maintainers

Note to maintainers: Remember to use Squash-Merge and edit the commit message to match the pull request summary while retaining Signed-off-by messages.


This is an automatic backport of pull request #1509 done by [Mergify](https://mergify.com).

@mergify mergify bot added the conflicts label Jul 17, 2025
@mergify mergify bot requested review from azeey and scpeters as code owners July 17, 2025 20:06
@mergify
Copy link
Contributor Author

mergify bot commented Jul 17, 2025

Cherry-pick of 4ebe022 has failed:

On branch mergify/bp/sdf14/pr-1509
Your branch is up to date with 'origin/sdf14'.

You are currently cherry-picking commit 4ebe022c.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   python/CMakeLists.txt

no changes added to commit (use "git add" and/or "git commit -a")

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

@scpeters
Copy link
Member

scpeters commented Jul 17, 2025

I force-pushed an amended cherry-pick

@azeey azeey added this to the Jetty Release milestone Jul 28, 2025
@azeey
Copy link
Collaborator

azeey commented Aug 1, 2025

@Mergifyio rebase

…1509)

Signed-off-by: Silvio Traversaro <silvio@traversaro.it>
(cherry picked from commit 4ebe022)
@mergify
Copy link
Contributor Author

mergify bot commented Aug 1, 2025

rebase

✅ Branch has been successfully rebased

@azeey azeey force-pushed the mergify/bp/sdf14/pr-1509 branch from 3547eb2 to 13a748c Compare August 1, 2025 23:26
@github-project-automation github-project-automation bot moved this from Inbox to In review in Core development Aug 1, 2025
@azeey azeey merged commit a6cbe26 into sdf14 Aug 6, 2025
12 checks passed
@azeey azeey deleted the mergify/bp/sdf14/pr-1509 branch August 6, 2025 21:05
@github-project-automation github-project-automation bot moved this from In review to Done in Core development Aug 6, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Projects

Status: Done

Development

Successfully merging this pull request may close these issues.

3 participants