mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-01-11 08:20:18 -06:00
Code Issues Packages Projects Releases Wiki Activity

Emscripten: Restore support for emsdk toolchain file and platform module

Browse Source 
Emscripten provides a combined toolchain file and platform module that
predates CMake upstream support.  Since commit 96d9b94a98 (Emscripten:
Add platform modules, 2025-05-16), our `Platform/Emscripten` module is
included instead, suppressing existing behavior for users that set
`CMAKE_TOOLCHAIN_FILE` to the emsdk-provided toolchain file.  Restore
the previous behavior by teaching our module to defer to the original
module in that case.

Issue: #27232
This commit is contained in:
Brad King
2025-09-17 19:05:18 -04:00
parent 9cbeb922dd
commit 644ad91e6a
1 changed files with 9 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
Modules/Platform/Emscripten.cmake
View File

@@ -1,3 +1,12 @@
# Emscripten provides a combined toolchain file and platform module
# that predates CMake upstream support. Avoid interfering with it.
if(CMAKE_SYSTEM_VERSION EQUAL 1)
if(CMAKE_TOOLCHAIN_FILE MATCHES [[/Modules/Platform/Emscripten\.cmake$]])
include("${CMAKE_TOOLCHAIN_FILE}")
return()
endif()
endif()
set(CMAKE_SHARED_LIBRARY_LINK_C_WITH_RUNTIME_PATH ON)
set(CMAKE_SHARED_LIBRARY_SUFFIX ".wasm")