Skip to content

Commit a1b9c39

Browse files
[CMake] Not even try to find libdispatch on WASI
1 parent e5104c3 commit a1b9c39

File tree

1 file changed

+15
-11
lines changed

1 file changed

+15
-11
lines changed

CMakeLists.txt

+15-11
Original file line numberDiff line numberDiff line change
@@ -93,18 +93,22 @@ if(NOT SwiftFoundation_MODULE_TRIPLE)
9393
endif()
9494

9595
# System dependencies
96-
find_package(dispatch CONFIG)
97-
if(NOT dispatch_FOUND AND NOT CMAKE_SYSTEM_NAME STREQUAL WASI)
98-
if(CMAKE_SYSTEM_NAME STREQUAL "Linux" OR CMAKE_SYSTEM_NAME STREQUAL "Android")
99-
set(DEFAULT_DISPATCH_INCLUDE_PATH "/usr/lib/swift")
100-
elseif(CMAKE_SYSTEM_NAME STREQUAL "Windows")
101-
set(DEFAULT_DISPATCH_INCLUDE_PATH "$ENV{SDKROOT}usr/include")
96+
97+
# We know libdispatch is always unavailable on WASI
98+
if(NOT CMAKE_SYSTEM_NAME STREQUAL WASI)
99+
find_package(dispatch CONFIG)
100+
if(NOT dispatch_FOUND)
101+
if(CMAKE_SYSTEM_NAME STREQUAL "Linux" OR CMAKE_SYSTEM_NAME STREQUAL "Android")
102+
set(DEFAULT_DISPATCH_INCLUDE_PATH "/usr/lib/swift")
103+
elseif(CMAKE_SYSTEM_NAME STREQUAL "Windows")
104+
set(DEFAULT_DISPATCH_INCLUDE_PATH "$ENV{SDKROOT}usr/include")
105+
endif()
106+
set(DISPATCH_INCLUDE_PATH "${DEFAULT_DISPATCH_INCLUDE_PATH}" CACHE STRING "A path to where you can find libdispatch headers")
107+
message("-- dispatch_DIR not found, using dispatch from SDK at ${DISPATCH_INCLUDE_PATH}")
108+
list(APPEND _Foundation_common_build_flags
109+
"-I${DISPATCH_INCLUDE_PATH}"
110+
"-I${DISPATCH_INCLUDE_PATH}/Block")
102111
endif()
103-
set(DISPATCH_INCLUDE_PATH "${DEFAULT_DISPATCH_INCLUDE_PATH}" CACHE STRING "A path to where you can find libdispatch headers")
104-
message("-- dispatch_DIR not found, using dispatch from SDK at ${DISPATCH_INCLUDE_PATH}")
105-
list(APPEND _Foundation_common_build_flags
106-
"-I${DISPATCH_INCLUDE_PATH}"
107-
"-I${DISPATCH_INCLUDE_PATH}/Block")
108112
endif()
109113
find_package(LibXml2 REQUIRED)
110114
find_package(CURL REQUIRED)

0 commit comments

Comments
 (0)