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

Commits on Aug 14, 2024

  1. Configuration menu
    Copy the full SHA
    fc97cc4 View commit details
    Browse the repository at this point in the history
  2. fix: escape paths with spaces in pybind11-config (google#4874)

    * 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 <henryschreineriii@gmail.com>
    
    * Support trailing backslashes
    
    Co-authored-by: Henry Schreiner <HenrySchreinerIII@gmail.com>
    
    ---------
    
    Signed-off-by: Henry Schreiner <henryschreineriii@gmail.com>
    Co-authored-by: Markus Bauer <markus.bauer@cispa.saarland>
    Co-authored-by: Henry Schreiner <HenrySchreinerIII@gmail.com>
    3 people authored Aug 14, 2024
    Configuration menu
    Copy the full SHA
    d893f97 View commit details
    Browse the repository at this point in the history
  3. feat: require CMake 3.15+ (google#5304)

    * feat: require CMake 3.15+
    
    Signed-off-by: Henry Schreiner <henryschreineriii@gmail.com>
    
    * Apply suggestions from code review
    
    * Update CMakeLists.txt
    
    * fix: adapt for CMake 3.30+ (using 3.18+)
    
    Signed-off-by: Henry Schreiner <henryschreineriii@gmail.com>
    
    ---------
    
    Signed-off-by: Henry Schreiner <henryschreineriii@gmail.com>
    henryiii authored Aug 14, 2024
    Configuration menu
    Copy the full SHA
    28dbce4 View commit details
    Browse the repository at this point in the history

Commits on Aug 15, 2024

  1. docs: prepare for 2.13.4 (google#5312)

    Signed-off-by: Henry Schreiner <henryschreineriii@gmail.com>
    henryiii authored Aug 15, 2024
    Configuration menu
    Copy the full SHA
    bd5951b View commit details
    Browse the repository at this point in the history
  2. Backport of google#30034 (google#5305)

    Ralf W. Grosse-Kunstleve authored Aug 15, 2024
    Configuration menu
    Copy the full SHA
    a1d0091 View commit details
    Browse the repository at this point in the history
  3. Merge branch 'master' into sh_merge_master

    Ralf W. Grosse-Kunstleve committed Aug 15, 2024
    Configuration menu
    Copy the full SHA
    205da0d View commit details
    Browse the repository at this point in the history
  4. Merge branch 'sh_merge_master' into pybind11k_merge_sh

    Ralf W. Grosse-Kunstleve committed Aug 15, 2024
    Configuration menu
    Copy the full SHA
    b4a424e View commit details
    Browse the repository at this point in the history