Skip to content

Commit 583b57e

Browse files
committed
Unneded
1 parent 83b9815 commit 583b57e

File tree

1 file changed

+15
-16
lines changed

1 file changed

+15
-16
lines changed

cmake/modules/AddSwift.cmake

Lines changed: 15 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1196,28 +1196,27 @@ function(add_swift_library name)
11961196
DEPLOYMENT_VERSION_IOS "${SWIFTLIB_DEPLOYMENT_VERSION_IOS}"
11971197
)
11981198

1199-
if(NOT SWIFTLIB_OBJECT_LIBRARY)
1199+
# Add dependencies on the (not-yet-created) custom lipo target.
1200+
foreach(DEP ${SWIFTLIB_LINK_LIBRARIES})
1201+
if (NOT "${DEP}" STREQUAL "icucore")
1202+
add_dependencies(${VARIANT_NAME}
1203+
"${DEP}-${SWIFT_SDK_${sdk}_LIB_SUBDIR}")
1204+
message("${VARIANT_NAME} ${DEP}-${SWIFT_SDK_${sdk}_LIB_SUBDIR}")
1205+
endif()
1206+
endforeach()
1207+
1208+
if (SWIFT_BUILD_STATIC_STDLIB AND SWIFTLIB_IS_STDLIB)
12001209
# Add dependencies on the (not-yet-created) custom lipo target.
12011210
foreach(DEP ${SWIFTLIB_LINK_LIBRARIES})
12021211
if (NOT "${DEP}" STREQUAL "icucore")
1203-
add_dependencies(${VARIANT_NAME}
1204-
"${DEP}-${SWIFT_SDK_${sdk}_LIB_SUBDIR}")
1212+
add_dependencies("${VARIANT_NAME}-static"
1213+
"${DEP}-${SWIFT_SDK_${sdk}_LIB_SUBDIR}-static")
12051214
endif()
12061215
endforeach()
1207-
1208-
if (SWIFT_BUILD_STATIC_STDLIB AND SWIFTLIB_IS_STDLIB)
1209-
# Add dependencies on the (not-yet-created) custom lipo target.
1210-
foreach(DEP ${SWIFTLIB_LINK_LIBRARIES})
1211-
if (NOT "${DEP}" STREQUAL "icucore")
1212-
add_dependencies("${VARIANT_NAME}-static"
1213-
"${DEP}-${SWIFT_SDK_${sdk}_LIB_SUBDIR}-static")
1214-
endif()
1215-
endforeach()
1216-
endif()
1217-
1218-
# Note this thin library.
1219-
list(APPEND THIN_INPUT_TARGETS ${VARIANT_NAME})
12201216
endif()
1217+
1218+
# Note this thin library.
1219+
list(APPEND THIN_INPUT_TARGETS ${VARIANT_NAME})
12211220
endforeach()
12221221

12231222
if(NOT SWIFTLIB_OBJECT_LIBRARY)

0 commit comments

Comments
 (0)