Skip to content

Commit 30068c8

Browse files
authored
Merge pull request #79405 from etcwilde/ewilde/fix-runtime-defaults
Fix runtime default variable naming
2 parents d8c8f65 + 8fe9c09 commit 30068c8

File tree

1 file changed

+7
-7
lines changed

1 file changed

+7
-7
lines changed

Runtimes/Core/cmake/modules/DefaultSettings.cmake

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -38,31 +38,31 @@ if(APPLE)
3838
set(SwiftCore_ENABLE_OBJC_INTEROP_default ON)
3939
set(SwiftCore_ENABLE_REFLECTION_default ON)
4040
set(SwiftCore_ENABLE_FATALERROR_BACKTRACE_default ON)
41-
set(SwiftCore_ENABLE_RUNTIME_OS_VERSIONING ON)
42-
set(SwiftCore_ENABLE_OVERRIDABLE_RETAIN_RELEASE ON)
41+
set(SwiftCore_ENABLE_RUNTIME_OS_VERSIONING_default ON)
42+
set(SwiftCore_ENABLE_OVERRIDABLE_RETAIN_RELEASE_default ON)
4343
set(SwiftCore_ENABLE_CONCURRENCY_default NO)
44-
set(SwiftCore_THREADING_PACKAGE "DARWIN")
44+
set(SwiftCore_THREADING_PACKAGE_default "DARWIN")
4545
set(SwiftCore_ENABLE_PRESPECIALIZATION_default ON)
4646
set(SwiftCore_CONCURRENCY_GLOBAL_EXECUTOR_default "dispatch")
4747
elseif(CMAKE_SYSTEM_NAME STREQUAL "WASM")
4848
set(SwiftCore_OBJECT_FORMAT_default "elf")
49-
set(SwiftCore_THREADING_PACKAGE "NONE")
49+
set(SwiftCore_THREADING_PACKAGE_default "NONE")
5050
set(SwiftCore_ENABLE_CONCURRENCY_default NO)
5151
set(SwiftCore_CONCURRENCY_GLOBAL_EXECUTOR_default "none")
5252
elseif(LINUX OR ANDROID OR BSD)
5353
set(SwiftCore_OBJECT_FORMAT_default "elf")
5454
set(SwiftCore_ENABLE_FATALERROR_BACKTRACE_default ON)
5555
if(LINUX)
56-
set(SwiftCore_THREADING_PACKAGE "LINUX")
56+
set(SwiftCore_THREADING_PACKAGE_default "LINUX")
5757
set(SwiftCore_ENABLE_PRESPECIALIZATION_default ON)
5858
else()
59-
set(SwiftCore_THREADING_PACKAGE "PTHREADS")
59+
set(SwiftCore_THREADING_PACKAGE_default "PTHREADS")
6060
endif()
6161
set(SwiftCore_ENABLE_CONCURRENCY_default NO)
6262
set(SwiftCore_CONCURRENCY_GLOBAL_EXECUTOR_default "dispatch")
6363
elseif(WIN32)
6464
set(SwiftCore_OBJECT_FORMAT_default "coff")
65-
set(SwiftCore_THREADING_PACKAGE "WIN32")
65+
set(SwiftCore_THREADING_PACKAGE_default "WIN32")
6666
set(SwiftCore_ENABLE_FATALERROR_BACKTRACE_default ON)
6767
set(SwiftCore_ENABLE_PRESPECIALIZATION_default ON)
6868
set(SwiftCore_ENABLE_CONCURRENCY_default NO)

0 commit comments

Comments
 (0)