Merge branch 'master' into smart_holder

This commit is contained in:
Ralf W. Grosse-Kunstleve 2021-04-08 23:17:31 -07:00
commit 88a09988e7
2 changed files with 2 additions and 2 deletions

View File

@ -20,7 +20,7 @@ jobs:
steps: steps:
- uses: actions/checkout@v2 - uses: actions/checkout@v2
- uses: actions/setup-python@v2 - uses: actions/setup-python@v2
- uses: pre-commit/action@v2.0.0 - uses: pre-commit/action@v2.0.2
with: with:
# Slow hooks are marked with manual - slow is okay here, run them too # Slow hooks are marked with manual - slow is okay here, run them too
extra_args: --hook-stage manual --all-files extra_args: --hook-stage manual --all-files

View File

@ -230,7 +230,7 @@ function(pybind11_add_module target_name)
endif() endif()
# If we don't pass a WITH_SOABI or WITHOUT_SOABI, use our own default handling of extensions # If we don't pass a WITH_SOABI or WITHOUT_SOABI, use our own default handling of extensions
if(NOT ARG_WITHOUT_SOABI OR NOT "WITH_SOABI" IN_LIST ARG_UNPARSED_ARGUMENTS) if(NOT ARG_WITHOUT_SOABI AND NOT "WITH_SOABI" IN_LIST ARG_UNPARSED_ARGUMENTS)
pybind11_extension(${target_name}) pybind11_extension(${target_name})
endif() endif()