Zengtudor/pybind11
1
0
Fork 0
mirror of https://github.com/pybind/pybind11.git synced 2024-11-21 20:55:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: find_import didn't work properly for classic tools (#2550)

Browse Source 
* fix: find_import didn't work properly for classic tools

* ci: fix all files not being checked in style run
This commit is contained in:
Henry Schreiner 2020-10-05 15:31:00 -04:00 committed by GitHub
parent 1411207711
commit 2a2f52201d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.github/workflows/format.yml vendored
View File

@ -22,7 +22,7 @@ jobs:
- uses: pre-commit/action@v2.0.0 - uses: pre-commit/action@v2.0.0
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 extra_args: --hook-stage manual --all-files
clang-tidy: clang-tidy:
name: Clang-Tidy name: Clang-Tidy

1
docs/cmake/index.rst
View File

@ -6,4 +6,3 @@ install with ``find_package(pybind11 CONFIG)``. The interface provided in
either case is functionally identical. either case is functionally identical.
.. cmake-module:: ../../tools/pybind11Config.cmake.in .. cmake-module:: ../../tools/pybind11Config.cmake.in

2
docs/requirements.txt
View File

@ -3,5 +3,5 @@ commonmark==0.9.1
recommonmark==0.6.0 recommonmark==0.6.0
sphinx==3.2.1 sphinx==3.2.1
sphinx_rtd_theme==0.5.0 sphinx_rtd_theme==0.5.0
sphinxcontrib-svg2pdfconverter==1.1.0
sphinxcontrib-moderncmakedomain==3.13 sphinxcontrib-moderncmakedomain==3.13
sphinxcontrib-svg2pdfconverter==1.1.0

2
tools/pybind11Common.cmake
View File

@ -196,7 +196,7 @@ else()
endif() endif()
# --------------------- pybind11_check_import ------------------------------- # --------------------- pybind11_find_import -------------------------------
if(NOT _pybind11_nopython) if(NOT _pybind11_nopython)
# Check to see if modules are importable. Use REQUIRED to force an error if # Check to see if modules are importable. Use REQUIRED to force an error if

7
tools/pybind11NewTools.cmake
View File

@ -94,9 +94,10 @@ execute_process(
ERROR_VARIABLE _PYTHON_MODULE_EXTENSION_ERR ERROR_VARIABLE _PYTHON_MODULE_EXTENSION_ERR
OUTPUT_STRIP_TRAILING_WHITESPACE) OUTPUT_STRIP_TRAILING_WHITESPACE)
if (_PYTHON_MODULE_EXTENSION STREQUAL "") if(_PYTHON_MODULE_EXTENSION STREQUAL "")
message(FATAL_ERROR "pybind11 could not query the module file extension, likely the 'distutils'" message(
"package is not installed. Full error message:\n${_PYTHON_MODULE_EXTENSION_ERR}") FATAL_ERROR "pybind11 could not query the module file extension, likely the 'distutils'"
"package is not installed. Full error message:\n${_PYTHON_MODULE_EXTENSION_ERR}")
endif() endif()
# This needs to be available for the pybind11_extension function # This needs to be available for the pybind11_extension function

4
tools/pybind11Tools.cmake
View File

@ -191,4 +191,6 @@ function(pybind11_add_module target_name)
endfunction() endfunction()
# Provide general way to call common Python commands in "common" file. # Provide general way to call common Python commands in "common" file.
set(_Python PYTHON) set(_Python
PYTHON
CACHE INTERNAL "" FORCE)