Skip to content

fix(cmake): pybind11.pc prefix and CMP0190 default across reconfigure #6165

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.

Sign up for GitHub

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

Draft
henryiii wants to merge 2 commits into
base: master
Choose a base branch
from
Draft

fix(cmake): pybind11.pc prefix and CMP0190 default across reconfigure #6165

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e1c81f5
fix(cmake): compute pybind11.pc prefix relative to CMAKE_INSTALL_DATA…
henryiii Sep 2, 2026
0113298
fix(cmake): keep CMP0190 cross-compiling default across reconfigure
henryiii Sep 2, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 19 additions & 15 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,12 +102,19 @@ option(PYBIND11_SIMPLE_GIL_MANAGEMENT
set(PYBIND11_INTERNALS_VERSION
""
CACHE STRING "Override the ABI version, may be used to enable the unstable ABI.")
# Record whether the project set this before option() supplies its OFF default, so
# pybind11Common.cmake can apply its CMP0190-aware default without clobbering an explicit value.
if(NOT DEFINED PYBIND11_USE_CROSSCOMPILING)
set(_PYBIND11_USE_CROSSCOMPILING_DEFAULTED ON)
# CMP0190 prohibits calling FindPython with both Interpreter and Development components
# when cross-compiling, unless CMAKE_CROSSCOMPILING_EMULATOR is defined. Compute the default
# here, before option() caches it, so that a reconfigure keeps it (pybind11Common.cmake applies
# the same default for find_package() consumers, where the option does not exist).
set(_pybind11_use_crosscompiling_default OFF)
if(CMAKE_VERSION VERSION_GREATER_EQUAL "4.1" AND NOT DEFINED CMAKE_CROSSCOMPILING_EMULATOR)
cmake_policy(GET CMP0190 _pybind11_cmp0190)
if(_pybind11_cmp0190 STREQUAL "NEW")
set(_pybind11_use_crosscompiling_default ON)
endif()
endif()
option(PYBIND11_USE_CROSSCOMPILING "Respect CMAKE_CROSSCOMPILING" OFF)
option(PYBIND11_USE_CROSSCOMPILING "Respect CMAKE_CROSSCOMPILING"
${_pybind11_use_crosscompiling_default})

cmake_dependent_option(
USE_PYTHON_INCLUDE_DIR
Expand Down Expand Up @@ -377,17 +384,14 @@ if(PYBIND11_INSTALL)
if(IS_ABSOLUTE "${CMAKE_INSTALL_DATAROOTDIR}")
set(prefix_for_pc_file "${CMAKE_INSTALL_PREFIX}")
else()
# Go up from the pkgconfig directory, then once more for each component of
# CMAKE_INSTALL_DATAROOTDIR, to get back to CMAKE_INSTALL_PREFIX.
set(pc_datarootdir "${CMAKE_INSTALL_DATAROOTDIR}")
if(CMAKE_VERSION VERSION_LESS 3.20)
set(prefix_for_pc_file "\${pcfiledir}/..")
while(pc_datarootdir)
get_filename_component(pc_datarootdir "${pc_datarootdir}" DIRECTORY)
string(APPEND prefix_for_pc_file "/..")
endwhile()
else()
cmake_path(RELATIVE_PATH CMAKE_INSTALL_PREFIX BASE_DIRECTORY CMAKE_INSTALL_DATAROOTDIR
OUTPUT_VARIABLE prefix_for_pc_file)
endif()
set(prefix_for_pc_file "\${pcfiledir}/..")
while(pc_datarootdir)
get_filename_component(pc_datarootdir "${pc_datarootdir}" DIRECTORY)
string(APPEND prefix_for_pc_file "/..")
endwhile()
endif()
endif()
join_paths(includedir_for_pc_file "\${prefix}" "${CMAKE_INSTALL_INCLUDEDIR}")
Expand Down
7 changes: 3 additions & 4 deletions tools/pybind11Common.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,12 +45,11 @@ set(pybind11_INCLUDE_DIRS
# when cross-compiling, unless the CMAKE_CROSSCOMPILING_EMULATOR variable is defined.
# Default PYBIND11_USE_CROSSCOMPILING to ON in that case, but never override a value the
# project set explicitly (e.g. Emscripten/Pyodide defines an emulator yet still wants it ON).
# PYBIND11_USE_CROSSCOMPILING is undefined for find_package() consumers, but our own
# CMakeLists.txt always defines it via option(); _PYBIND11_USE_CROSSCOMPILING_DEFAULTED tells
# us whether that came from the project or from the option() default.
# This applies to find_package() consumers only; the pybind11 project itself computes the same
# default for its PYBIND11_USE_CROSSCOMPILING option, which is always defined.
if(CMAKE_VERSION VERSION_GREATER_EQUAL "4.1"
AND NOT DEFINED CMAKE_CROSSCOMPILING_EMULATOR
AND (NOT DEFINED PYBIND11_USE_CROSSCOMPILING OR _PYBIND11_USE_CROSSCOMPILING_DEFAULTED))
AND NOT DEFINED PYBIND11_USE_CROSSCOMPILING)
cmake_policy(GET CMP0190 _pybind11_cmp0190)
if(_pybind11_cmp0190 STREQUAL "NEW")
set(PYBIND11_USE_CROSSCOMPILING "ON")
Expand Down
Loading