From e93765fd2eaec509e6e5e9cc206d78a1257e8a9f Mon Sep 17 00:00:00 2001 From: Rintaro Ishizaki Date: Mon, 16 Sep 2024 10:46:56 -0700 Subject: [PATCH 1/2] [CMake] Explicitly link Testing to Foundation (cherry picked from commit 79a443ad18ce4bc68fafcb7b991ac7fd1d0d177f) --- CMakeLists.txt | 5 +++++ Sources/Testing/CMakeLists.txt | 5 +++++ 2 files changed, 10 insertions(+) diff --git a/CMakeLists.txt b/CMakeLists.txt index ef465083a..ef8582def 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -15,6 +15,11 @@ endif() project(SwiftTesting LANGUAGES CXX Swift) +if(NOT APPLE) + find_package(dispatch CONFIG) + find_package(Foundation CONFIG) +endif() + include(GNUInstallDirs) list(APPEND CMAKE_MODULE_PATH diff --git a/Sources/Testing/CMakeLists.txt b/Sources/Testing/CMakeLists.txt index 573f198a9..8ea352587 100644 --- a/Sources/Testing/CMakeLists.txt +++ b/Sources/Testing/CMakeLists.txt @@ -94,6 +94,11 @@ add_library(Testing Traits/Trait.swift) target_link_libraries(Testing PRIVATE _TestingInternals) +if(NOT APPLE) + target_link_libraries(Testing PUBLIC + dispatch + Foundation) +endif() add_dependencies(Testing TestingMacros) target_compile_options(Testing PRIVATE From a60d685dc9bcd69ee265581e4e5f0825a7c81c07 Mon Sep 17 00:00:00 2001 From: Rintaro Ishizaki Date: Tue, 17 Sep 2024 01:10:22 -0700 Subject: [PATCH 2/2] Don't link to dispatch in WASI WASI doesn't support `libdispatch` (cherry picked from commit c2f8ccc66efff57840d2603a7722362266e53db7) --- CMakeLists.txt | 4 +++- Sources/Testing/CMakeLists.txt | 5 ++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index ef8582def..211bab7b3 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -16,7 +16,9 @@ project(SwiftTesting LANGUAGES CXX Swift) if(NOT APPLE) - find_package(dispatch CONFIG) + if(NOT CMAKE_SYSTEM_NAME STREQUAL WASI) + find_package(dispatch CONFIG) + endif() find_package(Foundation CONFIG) endif() diff --git a/Sources/Testing/CMakeLists.txt b/Sources/Testing/CMakeLists.txt index 8ea352587..f96e26179 100644 --- a/Sources/Testing/CMakeLists.txt +++ b/Sources/Testing/CMakeLists.txt @@ -95,8 +95,11 @@ add_library(Testing target_link_libraries(Testing PRIVATE _TestingInternals) if(NOT APPLE) + if(NOT CMAKE_SYSTEM_NAME STREQUAL WASI) + target_link_libraries(Testing PUBLIC + dispatch) + endif() target_link_libraries(Testing PUBLIC - dispatch Foundation) endif() add_dependencies(Testing