Skip to content

CMake: fix missing SWIFT_CONCURRENCY_GLOBAL_EXECUTOR value #65795

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 4 commits into from
May 17, 2023
Merged

CMake: fix missing SWIFT_CONCURRENCY_GLOBAL_EXECUTOR value #65795

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
5897ab5
CMake: fix missing `SWIFT_CONCURRENCY_GLOBAL_EXECUTOR` value
MaxDesiatov May 9, 2023
2db62ca
Fix `-DSWIFT_PATH_TO_LIBDISPATCH_STATIC_BUILD` value
MaxDesiatov May 10, 2023
5275255
Move `SWIFT_CONCURRENCY_USES_DISPATCH` to `StdlibOptions.cmake`
MaxDesiatov May 10, 2023
a25432d
Remove redundant `include(StdlibOptions)`
MaxDesiatov May 10, 2023
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
4 changes: 4 additions & 0 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -202,6 +202,10 @@ set(SWIFT_HOST_VARIANT_ARCH "${SWIFT_HOST_VARIANT_ARCH_default}" CACHE STRING
# This is primarily to support building smaller or faster project files.
#

# Subsequent options may refer to `StdlibOptions`, which have to be defined first.
list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_LIST_DIR}/stdlib/cmake/modules)
include(StdlibOptions)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Instead of including StdlibOptions here, why don't we move the following into StdlibOptions?

# Use dispatch as the system scheduler by default.
# For convenience, we set this to false when concurrency is disabled.
set(SWIFT_CONCURRENCY_USES_DISPATCH FALSE)
if(SWIFT_ENABLE_EXPERIMENTAL_CONCURRENCY AND "${SWIFT_CONCURRENCY_GLOBAL_EXECUTOR}" STREQUAL "dispatch")
  set(SWIFT_CONCURRENCY_USES_DISPATCH TRUE)
endif()

AFAICT it is only used in the stdlib build, so really has no business being set in the root CMakeLists.txt

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

^ Was just thinking that.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good point, that's addressed now.


option(SWIFT_APPEND_VC_REV
"Embed the version control system revision in Swift"
TRUE)
Expand Down