Skip to content

CMake fixes to allow use in dependent projects #196

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
merged 3 commits into from
Oct 5, 2025
Merged

CMake fixes to allow use in dependent projects #196

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5a07776
Fix CMake build on macOS/BSDs
owenv Oct 5, 2025
4530131
Add SwiftSubprocessConfig.cmake for use by dependent CMake projects
owenv Oct 5, 2025
a4589d5
Apply suggestions from code review
owenv Oct 5, 2025
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
2 changes: 2 additions & 0 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,3 +42,5 @@ add_subdirectory(Sources)
export(EXPORT SwiftSubprocessTargets
FILE "cmake/SwiftSubprocess/SwiftSubprocessTargets.cmake"
NAMESPACE "SwiftSubprocess::")

add_subdirectory(cmake/modules)
4 changes: 4 additions & 0 deletions Sources/Subprocess/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,10 +40,14 @@ elseif(APPLE)
Platforms/Subprocess+BSD.swift
Platforms/Subprocess+Darwin.swift
Platforms/Subprocess+Unix.swift)
target_compile_options(Subprocess PRIVATE
"$<$<COMPILE_LANGUAGE:Swift>:SHELL:-D SUBPROCESS_ASYNCIO_DISPATCH>")
elseif(FREEBSD OR OPENBSD)
target_sources(Subprocess PRIVATE
Platforms/Subprocess+BSD.swift
Platforms/Subprocess+Unix.swift)
target_compile_options(Subprocess PRIVATE
"$<$<COMPILE_LANGUAGE:Swift>:SHELL:-D SUBPROCESS_ASYNCIO_DISPATCH>")
endif()

target_compile_options(Subprocess PRIVATE
Expand Down
14 changes: 14 additions & 0 deletions cmake/modules/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
##===----------------------------------------------------------------------===##
##
## This source file is part of the Swift.org open source project
##
## Copyright (c) 2025 Apple Inc. and the Swift project authors
## Licensed under Apache License v2.0 with Runtime Library Exception
##
## See https://swift.org/LICENSE.txt for license information
##
##===----------------------------------------------------------------------===##

configure_file(SwiftSubprocessConfig.cmake.in
${CMAKE_CURRENT_BINARY_DIR}/SwiftSubprocessConfig.cmake)

12 changes: 12 additions & 0 deletions cmake/modules/SwiftSubprocessConfig.cmake.in
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
##===----------------------------------------------------------------------===##
##
## This source file is part of the Swift.org open source project
##
## Copyright (c) 2025 Apple Inc. and the Swift project authors
## Licensed under Apache License v2.0 with Runtime Library Exception
##
## See https://swift.org/LICENSE.txt for license information
##
##===----------------------------------------------------------------------===##

include(${CMAKE_CURRENT_BINARY_DIR}/../SwiftSubprocess/SwiftSubprocessTargets.cmake)