@@ -1433,12 +1433,12 @@ function(add_swift_target_library_single target name)
1433
1433
ENABLE_ASSERTIONS "${enable_assertions} "
1434
1434
ANALYZE_CODE_COVERAGE "${analyze_code_coverage} "
1435
1435
ENABLE_LTO "${lto_type} "
1436
- DEPLOYMENT_VERSION_OSX "${SWIFTLIB_DEPLOYMENT_VERSION_OSX } "
1437
- DEPLOYMENT_VERSION_MACCATALYST "${SWIFTLIB_DEPLOYMENT_VERSION_MACCATALYST } "
1438
- DEPLOYMENT_VERSION_IOS "${SWIFTLIB_DEPLOYMENT_VERSION_IOS } "
1439
- DEPLOYMENT_VERSION_TVOS "${SWIFTLIB_DEPLOYMENT_VERSION_TVOS } "
1440
- DEPLOYMENT_VERSION_WATCHOS "${SWIFTLIB_DEPLOYMENT_VERSION_WATCHOS } "
1441
- DEPLOYMENT_VERSION_XROS "${SWIFTLIB_DEPLOYMENT_VERSION_XROS } "
1436
+ DEPLOYMENT_VERSION_OSX "${SWIFTLIB_SINGLE_DEPLOYMENT_VERSION_OSX } "
1437
+ DEPLOYMENT_VERSION_MACCATALYST "${SWIFTLIB_SINGLE_DEPLOYMENT_VERSION_MACCATALYST } "
1438
+ DEPLOYMENT_VERSION_IOS "${SWIFTLIB_SINGLE_DEPLOYMENT_VERSION_IOS } "
1439
+ DEPLOYMENT_VERSION_TVOS "${SWIFTLIB_SINGLE_DEPLOYMENT_VERSION_TVOS } "
1440
+ DEPLOYMENT_VERSION_WATCHOS "${SWIFTLIB_SINGLE_DEPLOYMENT_VERSION_WATCHOS } "
1441
+ DEPLOYMENT_VERSION_XROS "${SWIFTLIB_SINGLE_DEPLOYMENT_VERSION_XROS } "
1442
1442
RESULT_VAR_NAME c_compile_flags
1443
1443
MACCATALYST_BUILD_FLAVOR "${SWIFTLIB_SINGLE_MACCATALYST_BUILD_FLAVOR} "
1444
1444
)
@@ -1456,12 +1456,12 @@ function(add_swift_target_library_single target name)
1456
1456
ANALYZE_CODE_COVERAGE "${analyze_code_coverage} "
1457
1457
ENABLE_LTO "${lto_type} "
1458
1458
LTO_OBJECT_NAME "${target} -${SWIFTLIB_SINGLE_SDK} -${SWIFTLIB_SINGLE_ARCHITECTURE} "
1459
- DEPLOYMENT_VERSION_OSX "${SWIFTLIB_DEPLOYMENT_VERSION_OSX } "
1460
- DEPLOYMENT_VERSION_MACCATALYST "${SWIFTLIB_DEPLOYMENT_VERSION_MACCATALYST } "
1461
- DEPLOYMENT_VERSION_IOS "${SWIFTLIB_DEPLOYMENT_VERSION_IOS } "
1462
- DEPLOYMENT_VERSION_TVOS "${SWIFTLIB_DEPLOYMENT_VERSION_TVOS } "
1463
- DEPLOYMENT_VERSION_WATCHOS "${SWIFTLIB_DEPLOYMENT_VERSION_WATCHOS } "
1464
- DEPLOYMENT_VERSION_XROS "${SWIFTLIB_DEPLOYMENT_VERSION_XROS } "
1459
+ DEPLOYMENT_VERSION_OSX "${SWIFTLIB_SINGLE_DEPLOYMENT_VERSION_OSX } "
1460
+ DEPLOYMENT_VERSION_MACCATALYST "${SWIFTLIB_SINGLE_DEPLOYMENT_VERSION_MACCATALYST } "
1461
+ DEPLOYMENT_VERSION_IOS "${SWIFTLIB_SINGLE_DEPLOYMENT_VERSION_IOS } "
1462
+ DEPLOYMENT_VERSION_TVOS "${SWIFTLIB_SINGLE_DEPLOYMENT_VERSION_TVOS } "
1463
+ DEPLOYMENT_VERSION_WATCHOS "${SWIFTLIB_SINGLE_DEPLOYMENT_VERSION_WATCHOS } "
1464
+ DEPLOYMENT_VERSION_XROS "${SWIFTLIB_SINGLE_DEPLOYMENT_VERSION_XROS } "
1465
1465
RESULT_VAR_NAME link_flags
1466
1466
LINK_LIBRARIES_VAR_NAME link_libraries
1467
1467
LIBRARY_SEARCH_DIRECTORIES_VAR_NAME library_search_directories
@@ -2828,7 +2828,13 @@ function(_add_swift_target_executable_single name)
2828
2828
INSTALL_IN_COMPONENT )
2829
2829
set (multiple_parameter_options
2830
2830
COMPILE_FLAGS
2831
- DEPENDS )
2831
+ DEPENDS
2832
+ DEPLOYMENT_VERSION_IOS
2833
+ DEPLOYMENT_VERSION_OSX
2834
+ DEPLOYMENT_VERSION_MACCATALYST
2835
+ DEPLOYMENT_VERSION_TVOS
2836
+ DEPLOYMENT_VERSION_WATCHOS
2837
+ DEPLOYMENT_VERSION_XROS )
2832
2838
cmake_parse_arguments (SWIFTEXE_SINGLE
2833
2839
"${options} "
2834
2840
"${single_parameter_options} "
@@ -2857,6 +2863,12 @@ function(_add_swift_target_executable_single name)
2857
2863
ENABLE_ASSERTIONS "${LLVM_ENABLE_ASSERTIONS} "
2858
2864
ENABLE_LTO "${SWIFT_STDLIB_ENABLE_LTO} "
2859
2865
ANALYZE_CODE_COVERAGE "${SWIFT_ANALYZE_CODE_COVERAGE} "
2866
+ DEPLOYMENT_VERSION_OSX "${SWIFTEXE_SINGLE_DEPLOYMENT_VERSION_OSX} "
2867
+ DEPLOYMENT_VERSION_MACCATALYST "${SWIFTEXE_SINGLE_DEPLOYMENT_VERSION_MACCATALYST} "
2868
+ DEPLOYMENT_VERSION_IOS "${SWIFTEXE_SINGLE_DEPLOYMENT_VERSION_IOS} "
2869
+ DEPLOYMENT_VERSION_TVOS "${SWIFTEXE_SINGLE_DEPLOYMENT_VERSION_TVOS} "
2870
+ DEPLOYMENT_VERSION_WATCHOS "${SWIFTEXE_SINGLE_DEPLOYMENT_VERSION_WATCHOS} "
2871
+ DEPLOYMENT_VERSION_XROS "${SWIFTEXE_SINGLE_DEPLOYMENT_VERSION_XROS} "
2860
2872
RESULT_VAR_NAME c_compile_flags )
2861
2873
_add_target_variant_link_flags (
2862
2874
SDK "${SWIFTEXE_SINGLE_SDK} "
@@ -2866,6 +2878,12 @@ function(_add_swift_target_executable_single name)
2866
2878
ENABLE_LTO "${SWIFT_STDLIB_ENABLE_LTO} "
2867
2879
LTO_OBJECT_NAME "${name} -${SWIFTEXE_SINGLE_SDK} -${SWIFTEXE_SINGLE_ARCHITECTURE} "
2868
2880
ANALYZE_CODE_COVERAGE "${SWIFT_ANALYZE_CODE_COVERAGE} "
2881
+ DEPLOYMENT_VERSION_OSX "${SWIFTEXE_SINGLE_DEPLOYMENT_VERSION_OSX} "
2882
+ DEPLOYMENT_VERSION_MACCATALYST "${SWIFTEXE_SINGLE_DEPLOYMENT_VERSION_MACCATALYST} "
2883
+ DEPLOYMENT_VERSION_IOS "${SWIFTEXE_SINGLE_DEPLOYMENT_VERSION_IOS} "
2884
+ DEPLOYMENT_VERSION_TVOS "${SWIFTEXE_SINGLE_DEPLOYMENT_VERSION_TVOS} "
2885
+ DEPLOYMENT_VERSION_WATCHOS "${SWIFTEXE_SINGLE_DEPLOYMENT_VERSION_WATCHOS} "
2886
+ DEPLOYMENT_VERSION_XROS "${SWIFTEXE_SINGLE_DEPLOYMENT_VERSION_XROS} "
2869
2887
RESULT_VAR_NAME link_flags
2870
2888
LINK_LIBRARIES_VAR_NAME link_libraries
2871
2889
LIBRARY_SEARCH_DIRECTORIES_VAR_NAME library_search_directories )
@@ -2896,6 +2914,12 @@ function(_add_swift_target_executable_single name)
2896
2914
COMPILE_FLAGS ${SWIFTEXE_SINGLE_COMPILE_FLAGS}
2897
2915
ENABLE_LTO "${SWIFT_STDLIB_ENABLE_LTO} "
2898
2916
INSTALL_IN_COMPONENT "${install_in_component} "
2917
+ DEPLOYMENT_VERSION_OSX "${SWIFTEXE_SINGLE_DEPLOYMENT_VERSION_OSX} "
2918
+ DEPLOYMENT_VERSION_MACCATALYST "${SWIFTEXE_SINGLE_DEPLOYMENT_VERSION_MACCATALYST} "
2919
+ DEPLOYMENT_VERSION_IOS "${SWIFTEXE_SINGLE_DEPLOYMENT_VERSION_IOS} "
2920
+ DEPLOYMENT_VERSION_TVOS "${SWIFTEXE_SINGLE_DEPLOYMENT_VERSION_TVOS} "
2921
+ DEPLOYMENT_VERSION_WATCHOS "${SWIFTEXE_SINGLE_DEPLOYMENT_VERSION_WATCHOS} "
2922
+ DEPLOYMENT_VERSION_XROS "${SWIFTEXE_SINGLE_DEPLOYMENT_VERSION_XROS} "
2899
2923
IS_MAIN )
2900
2924
add_swift_source_group ("${SWIFTEXE_SINGLE_EXTERNAL_SOURCES} " )
2901
2925
@@ -3015,6 +3039,12 @@ function(add_swift_target_executable name)
3015
3039
PREFER_STATIC
3016
3040
NOSWIFTRT )
3017
3041
set (SWIFTEXE_single_parameter_options
3042
+ DEPLOYMENT_VERSION_IOS
3043
+ DEPLOYMENT_VERSION_OSX
3044
+ DEPLOYMENT_VERSION_MACCATALYST
3045
+ DEPLOYMENT_VERSION_TVOS
3046
+ DEPLOYMENT_VERSION_WATCHOS
3047
+ DEPLOYMENT_VERSION_XROS
3018
3048
INSTALL_IN_COMPONENT )
3019
3049
set (SWIFTEXE_multiple_parameter_options
3020
3050
DEPENDS
@@ -3253,6 +3283,13 @@ function(add_swift_target_executable name)
3253
3283
${SWIFTEXE_TARGET_DEPENDS_with_suffix}
3254
3284
${swiftexe_module_dependency_targets}
3255
3285
${swiftexe_link_libraries_targets}
3286
+ DEPLOYMENT_VERSION_OSX "${SWIFTEXE_TARGET_DEPLOYMENT_VERSION_OSX} "
3287
+ DEPLOYMENT_VERSION_MACCATALYST
3288
+ "${SWIFTEXE_TARGET_DEPLOYMENT_VERSION_MACCATALYST} "
3289
+ DEPLOYMENT_VERSION_IOS "${SWIFTEXE_TARGET_DEPLOYMENT_VERSION_IOS} "
3290
+ DEPLOYMENT_VERSION_TVOS "${SWIFTEXE_TARGET_DEPLOYMENT_VERSION_TVOS} "
3291
+ DEPLOYMENT_VERSION_WATCHOS "${SWIFTEXE_TARGET_DEPLOYMENT_VERSION_WATCHOS} "
3292
+ DEPLOYMENT_VERSION_XROS "${SWIFTEXE_TARGET_DEPLOYMENT_VERSION_XROS} "
3256
3293
SDK "${sdk} "
3257
3294
ARCHITECTURE "${arch} "
3258
3295
COMPILE_FLAGS
0 commit comments