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

git merge smart_holder #30147

Merged
merged 7 commits into from
Aug 15, 2024
Merged

git merge smart_holder #30147

merged 7 commits into from
Aug 15, 2024

Conversation

rwgk
Copy link
Contributor

@rwgk rwgk commented Aug 15, 2024

Description

Helper/scratch PR for testing.

This update includes pybind/pybind11#5305, a backport of #30034 here.

Suggested changelog entry:

henryiii and others added 7 commits August 14, 2024 12:36
* fix: Escape paths with spaces in include list from --includes

* fix: --includes should not use shlex on Windows platforms

* Apply suggestions from code review

* fix: use custom impl

Signed-off-by: Henry Schreiner <[email protected]>

* Support trailing backslashes

Co-authored-by: Henry Schreiner <[email protected]>

---------

Signed-off-by: Henry Schreiner <[email protected]>
Co-authored-by: Markus Bauer <[email protected]>
Co-authored-by: Henry Schreiner <[email protected]>
* feat: require CMake 3.15+

Signed-off-by: Henry Schreiner <[email protected]>

* Apply suggestions from code review

* Update CMakeLists.txt

* fix: adapt for CMake 3.30+ (using 3.18+)

Signed-off-by: Henry Schreiner <[email protected]>

---------

Signed-off-by: Henry Schreiner <[email protected]>
Copy link

google-cla bot commented Aug 15, 2024

Thanks for your pull request! It looks like this may be your first contribution to a Google open source project. Before we can look at your pull request, you'll need to sign a Contributor License Agreement (CLA).

View this failed invocation of the CLA check for more information.

For the most up to date status, view the checks section at the bottom of the pull request.

@rwgk rwgk marked this pull request as ready for review August 15, 2024 06:47
@rwgk rwgk merged commit 604d089 into google:main Aug 15, 2024
73 checks passed
@rwgk rwgk deleted the pybind11k_merge_sh branch August 15, 2024 06:47
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.

3 participants