@@ -50,7 +50,7 @@ function(handle_swift_sources
50
50
sourcesvar externalvar name )
51
51
cmake_parse_arguments (SWIFTSOURCES
52
52
"IS_MAIN;IS_STDLIB;IS_STDLIB_CORE;IS_SDK_OVERLAY;EMBED_BITCODE;STATIC;NO_LINK_NAME;IS_FRAGILE"
53
- "SDK;ARCHITECTURE;INSTALL_IN_COMPONENT;MACCATALYST_BUILD_FLAVOR;BOOTSTRAPPING"
53
+ "SDK;ARCHITECTURE;INSTALL_IN_COMPONENT;DEPLOYMENT_VERSION_OSX; MACCATALYST_BUILD_FLAVOR;BOOTSTRAPPING"
54
54
"DEPENDS;COMPILE_FLAGS;MODULE_NAME;ENABLE_LTO"
55
55
${ARGN} )
56
56
translate_flag (${SWIFTSOURCES_IS_MAIN} "IS_MAIN" IS_MAIN_arg )
@@ -155,6 +155,7 @@ function(handle_swift_sources
155
155
${BOOTSTRAPPING_arg}
156
156
${IS_FRAGILE_arg}
157
157
INSTALL_IN_COMPONENT "${SWIFTSOURCES_INSTALL_IN_COMPONENT} "
158
+ DEPLOYMENT_VERSION_OSX ${SWIFTSOURCES_DEPLOYMENT_VERSION_OSX}
158
159
MACCATALYST_BUILD_FLAVOR "${SWIFTSOURCES_MACCATALYST_BUILD_FLAVOR} " )
159
160
set ("${dependency_target_out_var_name} " "${dependency_target} " PARENT_SCOPE )
160
161
set ("${dependency_module_target_out_var_name} " "${module_dependency_target} " PARENT_SCOPE )
@@ -222,7 +223,7 @@ function(_add_target_variant_swift_compile_flags
222
223
cmake_parse_arguments (
223
224
VARIANT # prefix
224
225
"" # options
225
- "MACCATALYST_BUILD_FLAVOR" # single-value args
226
+ "MACCATALYST_BUILD_FLAVOR;DEPLOYMENT_VERSION_OSX " # single-value args
226
227
"" # multi-value args
227
228
${ARGN} )
228
229
@@ -233,6 +234,10 @@ function(_add_target_variant_swift_compile_flags
233
234
234
235
if ("${sdk} " IN_LIST SWIFT_DARWIN_PLATFORMS )
235
236
set (sdk_deployment_version "${SWIFT_SDK_${sdk} _DEPLOYMENT_VERSION}" )
237
+ if ("${sdk} " STREQUAL "OSX" AND DEFINED VARIANT_DEPLOYMENT_VERSION_OSX )
238
+ set (sdk_deployment_version ${VARIANT_DEPLOYMENT_VERSION_OSX} )
239
+ endif ()
240
+
236
241
get_target_triple (target target_variant "${sdk} " "${arch} "
237
242
MACCATALYST_BUILD_FLAVOR "${VARIANT_MACCATALYST_BUILD_FLAVOR} "
238
243
DEPLOYMENT_VERSION "${sdk_deployment_version} " )
@@ -379,7 +384,7 @@ function(_compile_swift_files
379
384
dependency_sibgen_target_out_var_name )
380
385
cmake_parse_arguments (SWIFTFILE
381
386
"IS_MAIN;IS_STDLIB;IS_STDLIB_CORE;IS_SDK_OVERLAY;EMBED_BITCODE;STATIC;IS_FRAGILE"
382
- "OUTPUT;MODULE_NAME;INSTALL_IN_COMPONENT;MACCATALYST_BUILD_FLAVOR;BOOTSTRAPPING"
387
+ "OUTPUT;MODULE_NAME;INSTALL_IN_COMPONENT;DEPLOYMENT_VERSION_OSX; MACCATALYST_BUILD_FLAVOR;BOOTSTRAPPING"
383
388
"SOURCES;FLAGS;DEPENDS;SDK;ARCHITECTURE;OPT_FLAGS;MODULE_DIR"
384
389
${ARGN} )
385
390
@@ -452,6 +457,7 @@ function(_compile_swift_files
452
457
"${SWIFT_STDLIB_BUILD_TYPE} "
453
458
"${SWIFT_STDLIB_ASSERTIONS} "
454
459
swift_flags
460
+ DEPLOYMENT_VERSION_OSX ${SWIFTFILE_DEPLOYMENT_VERSION_OSX}
455
461
MACCATALYST_BUILD_FLAVOR "${maccatalyst_build_flavor} "
456
462
)
457
463
0 commit comments