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

fix(build): avoid a possible warning about shadowed variables and changing behaviors (#3220)

Browse Source
This commit is contained in:
Henry Schreiner 2021-09-23 15:42:16 -04:00 committed by GitHub
parent 21282e645a
commit 6ad3f874a7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 18 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
tools/pybind11Tools.cmake
View File

@ -45,31 +45,25 @@ list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_LIST_DIR}")
find_package(PythonLibsNew ${PYBIND11_PYTHON_VERSION} MODULE REQUIRED ${_pybind11_quiet}) find_package(PythonLibsNew ${PYBIND11_PYTHON_VERSION} MODULE REQUIRED ${_pybind11_quiet})
list(REMOVE_AT CMAKE_MODULE_PATH -1) list(REMOVE_AT CMAKE_MODULE_PATH -1)
# Makes a normal variable a cached variable
macro(_PYBIND11_PROMOTE_TO_CACHE NAME)
set(_tmp_ptc "${${NAME}}")
# CMake 3.21 complains if a cached variable is shadowed by a normal one
unset(${NAME})
set(${NAME}
"${_tmp_ptc}"
CACHE INTERNAL "")
endmacro()
# Cache variables so pybind11_add_module can be used in parent projects # Cache variables so pybind11_add_module can be used in parent projects
set(PYTHON_INCLUDE_DIRS _pybind11_promote_to_cache(PYTHON_INCLUDE_DIRS)
${PYTHON_INCLUDE_DIRS} _pybind11_promote_to_cache(PYTHON_LIBRARIES)
CACHE INTERNAL "") _pybind11_promote_to_cache(PYTHON_MODULE_PREFIX)
set(PYTHON_LIBRARIES _pybind11_promote_to_cache(PYTHON_MODULE_EXTENSION)
${PYTHON_LIBRARIES} _pybind11_promote_to_cache(PYTHON_VERSION_MAJOR)
CACHE INTERNAL "") _pybind11_promote_to_cache(PYTHON_VERSION_MINOR)
set(PYTHON_MODULE_PREFIX _pybind11_promote_to_cache(PYTHON_VERSION)
${PYTHON_MODULE_PREFIX} _pybind11_promote_to_cache(PYTHON_IS_DEBUG)
CACHE INTERNAL "")
set(PYTHON_MODULE_EXTENSION
${PYTHON_MODULE_EXTENSION}
CACHE INTERNAL "")
set(PYTHON_VERSION_MAJOR
${PYTHON_VERSION_MAJOR}
CACHE INTERNAL "")
set(PYTHON_VERSION_MINOR
${PYTHON_VERSION_MINOR}
CACHE INTERNAL "")
set(PYTHON_VERSION
${PYTHON_VERSION}
CACHE INTERNAL "")
set(PYTHON_IS_DEBUG
"${PYTHON_IS_DEBUG}"
CACHE INTERNAL "")
if(PYBIND11_MASTER_PROJECT) if(PYBIND11_MASTER_PROJECT)
if(PYTHON_MODULE_EXTENSION MATCHES "pypy") if(PYTHON_MODULE_EXTENSION MATCHES "pypy")