fix(cmake): add required emscripten flags by henryiii · Pull Request #5298 · pybind/pybind11 · GitHub
Skip to content

fix(cmake): add required emscripten flags #5298

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

Merged
henryiii merged 11 commits into from
Aug 12, 2024
Merged

fix(cmake): add required emscripten flags #5298

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
8e331a4
fix(cmake): add required emscripten flags
henryiii Aug 12, 2024
d61a69b
Update emscripten.yaml
henryiii Aug 12, 2024
8692a12
fix(cmake): add required emscripten flags to headers target
henryiii Aug 12, 2024
7f8287d
fix(cmake): incorrect detection of Emscripten
henryiii Aug 12, 2024
613fb0f
fix(cmake): allow pybind11::headers to be modified
henryiii Aug 12, 2024
6a3ca2d
fix(cmake): hide a warning when building the tests standalone
henryiii Aug 12, 2024
3a3ab40
fix(cmake): use explicit variable for is config
henryiii Aug 12, 2024
f7951b9
fix(cmake): go back to ALIAS target
henryiii Aug 12, 2024
1223a98
chore: reduce overall diff
henryiii Aug 12, 2024
9c89f7a
chore: reduce overall diff
henryiii Aug 12, 2024
7273ca5
chore: shorten code a bit
henryiii Aug 12, 2024
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
4 changes: 2 additions & 2 deletions .github/workflows/emscripten.yaml
View file
Open in desktop
4 changes: 4 additions & 0 deletions tests/pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,10 @@ name = "pybind11_tests"
version = "0.0.1"
dependencies = ["pytest", "pytest-timeout", "numpy", "scipy"]

[tool.scikit-build]
# Hide a warning while we also support CMake < 3.15
cmake.version = ">=3.15"

[tool.scikit-build.cmake.define]
PYBIND11_FINDPYTHON = true

Expand Down
30 changes: 28 additions & 2 deletions tools/pybind11Common.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

Adds the following targets::

pybind11::pybind11 - link to headers and pybind11
pybind11::pybind11 - link to Python headers and pybind11::headers
pybind11::module - Adds module links
pybind11::embed - Adds embed links
pybind11::lto - Link time optimizations (only if CMAKE_INTERPROCEDURAL_OPTIMIZATION is not set)
Expand Down Expand Up @@ -75,6 +75,32 @@ set_property(
APPEND
PROPERTY INTERFACE_LINK_LIBRARIES pybind11::pybind11)

# -------------- emscripten requires exceptions enabled -------------
# _pybind11_no_exceptions is a private mechanism to disable this addition.
# Please open an issue if you need to use it; it will be removed if no one
# needs it.
if(CMAKE_SYSTEM_NAME MATCHES Emscripten AND NOT _pybind11_no_exceptions)
if(CMAKE_VERSION VERSION_LESS 3.13)
message(WARNING "CMake 3.13+ is required to build for Emscripten. Some flags will be missing")
else()
if(_is_config)
set(_tmp_config_target pybind11::pybind11_headers)
else()
set(_tmp_config_target pybind11_headers)
endif()

set_property(
TARGET ${_tmp_config_target}
APPEND
PROPERTY INTERFACE_LINK_OPTIONS -fexceptions)
set_property(
TARGET ${_tmp_config_target}
APPEND
PROPERTY INTERFACE_COMPILE_OPTIONS -fexceptions)
unset(_tmp_config_target)
endif()
endif()

# --------------------------- link helper ---------------------------

add_library(pybind11::python_link_helper IMPORTED INTERFACE ${optional_global})
Expand Down Expand Up @@ -329,7 +355,7 @@ function(_pybind11_generate_lto target prefer_thin_lto)

if(CMAKE_SYSTEM_PROCESSOR MATCHES "ppc64le" OR CMAKE_SYSTEM_PROCESSOR MATCHES "mips64")
# Do nothing
elseif(CMAKE_SYSTEM_PROCESSOR MATCHES emscripten)
elseif(CMAKE_SYSTEM_NAME MATCHES Emscripten)
# This compile is very costly when cross-compiling, so set this without checking
set(PYBIND11_LTO_CXX_FLAGS "-flto${thin}${cxx_append}")
set(PYBIND11_LTO_LINKER_FLAGS "-flto${thin}${linker_append}")
Expand Down
2 changes: 1 addition & 1 deletion tools/pybind11Config.cmake.in
View file
Open in desktop