Skip to content

Commit f273a2e

Browse files
committed
[CMake] Enable unicode data support
Stubs has a macro define for enabling or disabling the embedded unicode data tables, which are required for doing things like counting characters in strings. Add that option and default it to 'on' for full unicode support.
1 parent f5d690b commit f273a2e

File tree

2 files changed

+4
-1
lines changed

2 files changed

+4
-1
lines changed

Runtimes/Core/CMakeLists.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -88,6 +88,7 @@ defaulted_option(SwiftCore_ENABLE_STATIC_PRINT "Disable full print")
8888
defaulted_option(SwiftCore_ENABLE_UNICODE_DATA "Embed Unicode info in Swift Core")
8989
defaulted_option(SwiftCore_ENABLE_COMPACT_ABSOLUTE_FUNCTION_POINTERS "Resolve absolute function pointer as identity")
9090
defaulted_option(SwiftCore_ENABLE_BACKDEPLOYMENT_SUPPORT "Add symbols for runtime backdeployment")
91+
option(SwiftCore_ENABLE_UNICODE_DATA "Include unicode data in Swift runtimes" ON)
9192

9293
defaulted_option(SwiftCore_ENABLE_BACKTRACING "Enable backtracing runtime support")
9394
defaulted_set(SwiftCore_BACKTRACER_PATH STRING "Set a fixed path to the Swift backtracer")

Runtimes/Core/stubs/CMakeLists.txt

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,9 @@ if(SwiftCore_ENABLE_OBJC_INTEROP)
2626
endif()
2727

2828

29-
target_compile_definitions(swiftStdlibStubs PRIVATE swiftCore_EXPORTS)
29+
target_compile_definitions(swiftStdlibStubs PRIVATE
30+
swiftCore_EXPORTS
31+
$<$<BOOL:${SwiftCore_ENABLE_UNICODE_DATA}>:-DSWIFT_STDLIB_ENABLE_UNICODE_DATA>)
3032
target_link_libraries(swiftStdlibStubs PRIVATE swiftShims)
3133
target_include_directories(swiftStdlibStubs PRIVATE
3234
"${PROJECT_BINARY_DIR}/include"

0 commit comments

Comments
 (0)