Skip to content

build: add a shim for WASI detection on older CMake #5442

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

Open
compnerd wants to merge 1 commit into
base: main
Choose a base branch
from
Open

build: add a shim for WASI detection on older CMake #5442

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
13 changes: 10 additions & 3 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,13 @@ endif()
project(Foundation
LANGUAGES C Swift)

if(CMAKE_VERSION VERSION_LESS 3.31)
if(CMAKE_SYSTEM_NAME STREQUAL "Generic" AND CMAKE_SYSTEM_PROCESSOR MATCHES "wasm32")
set(CMAKE_SYSTEM_NAME WASI)
set(WASI 1)
endif()
endif()

option(FOUNDATION_SWIFTPM_DEPS "build Windows SwiftPM dependencies via CMake" NO)
if(FOUNDATION_SWIFTPM_DEPS)
include(WindowsSwiftPMDependencies)
Expand Down Expand Up @@ -75,7 +82,7 @@ if(BUILD_SHARED_LIBS)
endif()

set(FOUNDATION_BUILD_NETWORKING_default ON)
if(CMAKE_SYSTEM_NAME STREQUAL "WASI")
if(WASI)
# Networking is not supported on WASI
set(FOUNDATION_BUILD_NETWORKING_default OFF)
endif()
Expand Down Expand Up @@ -150,7 +157,7 @@ endif()
# System dependencies

# We know libdispatch is always unavailable on WASI
if(NOT CMAKE_SYSTEM_NAME STREQUAL "WASI")
if(NOT WASI)
find_package(LibRT)
find_package(dispatch CONFIG)
if(NOT dispatch_FOUND)
Expand Down Expand Up @@ -229,7 +236,7 @@ list(APPEND _Foundation_swift_build_flags
"-Xfrontend"
"-require-explicit-sendable")

if(CMAKE_SYSTEM_NAME STREQUAL "WASI")
if(WASI)
# Enable wasi-libc emulation features
set(WASI_EMULATION_DEFS _WASI_EMULATED_MMAN _WASI_EMULATED_SIGNAL _WASI_EMULATED_PROCESS_CLOCKS)
foreach(def ${WASI_EMULATION_DEFS})
Expand Down
2 changes: 1 addition & 1 deletion Sources/CoreFoundation/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,7 @@ target_link_libraries(CoreFoundation
_FoundationICU
dispatch)

if(CMAKE_SYSTEM_NAME STREQUAL "WASI")
if(WASI)
# On WASI, we use vendored BlocksRuntime instead of the one from libdispatch
add_subdirectory(BlockRuntime)
# Add BlocksRuntime object library to CoreFoundation static archive
Expand Down
2 changes: 1 addition & 1 deletion Sources/_CFXMLInterface/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ target_link_libraries(_CFXMLInterface PRIVATE
dispatch
LibXml2::LibXml2)

if(CMAKE_SYSTEM_NAME STREQUAL "WASI")
if(WASI)
target_link_libraries(_CFXMLInterface PRIVATE BlocksRuntime)
endif()

Expand Down