@@ -567,7 +567,7 @@ function(_add_swift_library_single target name)
567
567
cmake_parse_arguments (SWIFTLIB_SINGLE
568
568
"${SWIFTLIB_SINGLE_options} "
569
569
"MODULE_TARGET;SDK;ARCHITECTURE;INSTALL_IN_COMPONENT;DEPLOYMENT_VERSION_OSX;DEPLOYMENT_VERSION_IOS;DEPLOYMENT_VERSION_TVOS;DEPLOYMENT_VERSION_WATCHOS"
570
- "DEPENDS;LINK_LIBRARIES;FRAMEWORK_DEPENDS;FRAMEWORK_DEPENDS_WEAK;LLVM_COMPONENT_DEPENDS;C_COMPILE_FLAGS;SWIFT_COMPILE_FLAGS;LINK_FLAGS;PRIVATE_LINK_LIBRARIES;INTERFACE_LINK_LIBRARIES;INCORPORATE_OBJECT_LIBRARIES;FILE_DEPENDS"
570
+ "DEPENDS;LINK_LIBRARIES;FRAMEWORK_DEPENDS;FRAMEWORK_DEPENDS_WEAK;LLVM_COMPONENT_DEPENDS;C_COMPILE_FLAGS;SWIFT_COMPILE_FLAGS;LINK_FLAGS;PRIVATE_LINK_LIBRARIES;INTERFACE_LINK_LIBRARIES;INCORPORATE_OBJECT_LIBRARIES;INCORPORATE_OBJECT_LIBRARIES_SHARED_ONLY; FILE_DEPENDS"
571
571
${ARGN} )
572
572
573
573
set (SWIFTLIB_SINGLE_SOURCES ${SWIFTLIB_SINGLE_UNPARSED_ARGUMENTS} )
@@ -739,6 +739,12 @@ function(_add_swift_library_single target name)
739
739
$<TARGET_OBJECTS:${object_library}${VARIANT_SUFFIX} >)
740
740
endforeach ()
741
741
742
+ set (SWIFTLIB_INCORPORATED_OBJECT_LIBRARIES_EXPRESSIONS_SHARED_ONLY)
743
+ foreach (object_library ${SWIFTLIB_SINGLE_INCORPORATE_OBJECT_LIBRARIES_SHARED_ONLY} )
744
+ list (APPEND SWIFTLIB_INCORPORATED_OBJECT_LIBRARIES_EXPRESSIONS_SHARED_ONLY
745
+ $<TARGET_OBJECTS:${object_library}${VARIANT_SUFFIX} >)
746
+ endforeach ()
747
+
742
748
set (SWIFTLIB_SINGLE_XCODE_WORKAROUND_SOURCES)
743
749
if (XCODE AND SWIFTLIB_SINGLE_TARGET_LIBRARY)
744
750
set (SWIFTLIB_SINGLE_XCODE_WORKAROUND_SOURCES
@@ -747,11 +753,17 @@ function(_add_swift_library_single target name)
747
753
${SWIFT_SOURCE_DIR} /cmake/dummy.cpp)
748
754
endif ()
749
755
756
+ set (INCORPORATED_OBJECT_LIBRARIES_EXPRESSIONS ${SWIFTLIB_INCORPORATED_OBJECT_LIBRARIES_EXPRESSIONS} )
757
+ if (${libkind} STREQUAL "SHARED" )
758
+ list (APPEND INCORPORATED_OBJECT_LIBRARIES_EXPRESSIONS
759
+ ${SWIFTLIB_INCORPORATED_OBJECT_LIBRARIES_EXPRESSIONS_SHARED_ONLY} )
760
+ endif ()
761
+
750
762
add_library ("${target} " ${libkind}
751
763
${SWIFT_SECTIONS_OBJECT_BEGIN}
752
764
${SWIFTLIB_SINGLE_SOURCES}
753
765
${SWIFTLIB_SINGLE_EXTERNAL_SOURCES}
754
- ${SWIFTLIB_INCORPORATED_OBJECT_LIBRARIES_EXPRESSIONS }
766
+ ${INCORPORATED_OBJECT_LIBRARIES_EXPRESSIONS }
755
767
${SWIFTLIB_SINGLE_XCODE_WORKAROUND_SOURCES}
756
768
${SWIFT_SECTIONS_OBJECT_END} )
757
769
_set_target_prefix_and_suffix("${target} " "${libkind} " "${SWIFTLIB_SINGLE_SDK} " )
@@ -1270,7 +1282,7 @@ function(add_swift_library name)
1270
1282
cmake_parse_arguments (SWIFTLIB
1271
1283
"${SWIFTLIB_options} "
1272
1284
"INSTALL_IN_COMPONENT;DEPLOYMENT_VERSION_OSX;DEPLOYMENT_VERSION_IOS;DEPLOYMENT_VERSION_TVOS;DEPLOYMENT_VERSION_WATCHOS"
1273
- "DEPENDS;LINK_LIBRARIES;SWIFT_MODULE_DEPENDS;SWIFT_MODULE_DEPENDS_OSX;SWIFT_MODULE_DEPENDS_IOS;SWIFT_MODULE_DEPENDS_TVOS;SWIFT_MODULE_DEPENDS_WATCHOS;SWIFT_MODULE_DEPENDS_FREEBSD;SWIFT_MODULE_DEPENDS_LINUX;FRAMEWORK_DEPENDS;FRAMEWORK_DEPENDS_WEAK;FRAMEWORK_DEPENDS_OSX;FRAMEWORK_DEPENDS_IOS_TVOS;LLVM_COMPONENT_DEPENDS;FILE_DEPENDS;TARGET_SDKS;C_COMPILE_FLAGS;SWIFT_COMPILE_FLAGS;SWIFT_COMPILE_FLAGS_OSX;SWIFT_COMPILE_FLAGS_IOS;SWIFT_COMPILE_FLAGS_TVOS;SWIFT_COMPILE_FLAGS_WATCHOS;LINK_FLAGS;PRIVATE_LINK_LIBRARIES;INTERFACE_LINK_LIBRARIES;INCORPORATE_OBJECT_LIBRARIES"
1285
+ "DEPENDS;LINK_LIBRARIES;SWIFT_MODULE_DEPENDS;SWIFT_MODULE_DEPENDS_OSX;SWIFT_MODULE_DEPENDS_IOS;SWIFT_MODULE_DEPENDS_TVOS;SWIFT_MODULE_DEPENDS_WATCHOS;SWIFT_MODULE_DEPENDS_FREEBSD;SWIFT_MODULE_DEPENDS_LINUX;FRAMEWORK_DEPENDS;FRAMEWORK_DEPENDS_WEAK;FRAMEWORK_DEPENDS_OSX;FRAMEWORK_DEPENDS_IOS_TVOS;LLVM_COMPONENT_DEPENDS;FILE_DEPENDS;TARGET_SDKS;C_COMPILE_FLAGS;SWIFT_COMPILE_FLAGS;SWIFT_COMPILE_FLAGS_OSX;SWIFT_COMPILE_FLAGS_IOS;SWIFT_COMPILE_FLAGS_TVOS;SWIFT_COMPILE_FLAGS_WATCHOS;LINK_FLAGS;PRIVATE_LINK_LIBRARIES;INTERFACE_LINK_LIBRARIES;INCORPORATE_OBJECT_LIBRARIES;INCORPORATE_OBJECT_LIBRARIES_SHARED_ONLY "
1274
1286
${ARGN} )
1275
1287
set (SWIFTLIB_SOURCES ${SWIFTLIB_UNPARSED_ARGUMENTS} )
1276
1288
@@ -1491,6 +1503,7 @@ function(add_swift_library name)
1491
1503
LINK_FLAGS ${SWIFTLIB_LINK_FLAGS}
1492
1504
PRIVATE_LINK_LIBRARIES ${swiftlib_private_link_libraries_targets}
1493
1505
INCORPORATE_OBJECT_LIBRARIES ${SWIFTLIB_INCORPORATE_OBJECT_LIBRARIES}
1506
+ INCORPORATE_OBJECT_LIBRARIES_SHARED_ONLY ${SWIFTLIB_INCORPORATE_OBJECT_LIBRARIES_SHARED_ONLY}
1494
1507
${SWIFTLIB_DONT_EMBED_BITCODE_keyword}
1495
1508
${SWIFTLIB_API_NOTES_NON_OVERLAY_keyword}
1496
1509
${SWIFTLIB_IS_STDLIB_keyword}
@@ -1682,6 +1695,7 @@ function(add_swift_library name)
1682
1695
PRIVATE_LINK_LIBRARIES ${SWIFTLIB_PRIVATE_LINK_LIBRARIES}
1683
1696
INTERFACE_LINK_LIBRARIES ${SWIFTLIB_INTERFACE_LINK_LIBRARIES}
1684
1697
INCORPORATE_OBJECT_LIBRARIES ${SWIFTLIB_INCORPORATE_OBJECT_LIBRARIES}
1698
+ INCORPORATE_OBJECT_LIBRARIES_SHARED_ONLY ${SWIFTLIB_INCORPORATE_OBJECT_LIBRARIES_SHARED_ONLY}
1685
1699
${SWIFTLIB_DONT_EMBED_BITCODE_keyword}
1686
1700
${SWIFTLIB_API_NOTES_NON_OVERLAY_keyword}
1687
1701
${SWIFTLIB_IS_STDLIB_keyword}
0 commit comments