Skip to content

Commit e98ea05

Browse files
committed
Fix runtime default variable naming
The names of the variables in `DefaultSettings` should end in `_default` so that the variable that they are defaulting can be overridden. Otherwise CMake will just set the value and move on overriding the setting coming from the commandline/cache file.
1 parent d9b6a82 commit e98ea05

File tree

1 file changed

+6
-6
lines changed

1 file changed

+6
-6
lines changed

Runtimes/Core/cmake/modules/DefaultSettings.cmake

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -38,25 +38,25 @@ 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)
43-
set(SwiftCore_THREADING_PACKAGE "DARWIN")
41+
set(SwiftCore_ENABLE_RUNTIME_OS_VERSIONING_default ON)
42+
set(SwiftCore_ENABLE_OVERRIDABLE_RETAIN_RELEASE_default ON)
43+
set(SwiftCore_THREADING_PACKAGE_default "DARWIN")
4444
set(SwiftCore_ENABLE_PRESPECIALIZATION_default ON)
4545
elseif(CMAKE_SYSTEM_NAME STREQUAL "WASM")
4646
set(SwiftCore_OBJECT_FORMAT_default "elf")
47-
set(SwiftCore_THREADING_PACKAGE "NONE")
47+
set(SwiftCore_THREADING_PACKAGE_default "NONE")
4848
elseif(LINUX OR ANDROID OR BSD)
4949
set(SwiftCore_OBJECT_FORMAT_default "elf")
5050
set(SwiftCore_ENABLE_FATALERROR_BACKTRACE_default ON)
5151
if(LINUX)
5252
set(SwiftCore_THREADING_PACKAGE "LINUX")
5353
set(SwiftCore_ENABLE_PRESPECIALIZATION_default ON)
5454
else()
55-
set(SwiftCore_THREADING_PACKAGE "PTHREADS")
55+
set(SwiftCore_THREADING_PACKAGE_default "PTHREADS")
5656
endif()
5757
elseif(WIN32)
5858
set(SwiftCore_OBJECT_FORMAT_default "coff")
59-
set(SwiftCore_THREADING_PACKAGE "WIN32")
59+
set(SwiftCore_THREADING_PACKAGE_default "WIN32")
6060
set(SwiftCore_ENABLE_FATALERROR_BACKTRACE_default ON)
6161
set(SwiftCore_ENABLE_PRESPECIALIZATION_default ON)
6262
endif()

0 commit comments

Comments
 (0)