@@ -465,7 +465,7 @@ endfunction()
465
465
function (swift_target_link_search_directories target directories )
466
466
set (STLD_FLAGS "" )
467
467
foreach (directory ${directories} )
468
- set (STLD_FLAGS " ${CMAKE_LIBRARY_PATH_FLAG}${directory} " )
468
+ set (STLD_FLAGS "${STLD_FLAGS} ${CMAKE_LIBRARY_PATH_FLAG}${directory} " )
469
469
endforeach ()
470
470
set_property (TARGET ${target} APPEND_STRING PROPERTY LINK_FLAGS ${STLD_FLAGS} )
471
471
endfunction ()
@@ -1109,7 +1109,7 @@ function(_add_swift_library_single target name)
1109
1109
COMPILE_FLAGS " ${c_compile_flags} " )
1110
1110
set_property (TARGET "${target} " APPEND_STRING PROPERTY
1111
1111
LINK_FLAGS " ${link_flags} " )
1112
- swift_target_link_search_directories (${target} ${library_search_directories} )
1112
+ swift_target_link_search_directories (" ${target} " " ${library_search_directories} " )
1113
1113
1114
1114
# Adjust the linked libraries for windows targets. On Windows, the link is
1115
1115
# performed against the import library, and the runtime uses the dll. Not
@@ -1165,8 +1165,7 @@ function(_add_swift_library_single target name)
1165
1165
"${SWIFTSTATICLIB_DIR} /${SWIFTLIB_SINGLE_SUBDIR} "
1166
1166
"${SWIFT_NATIVE_SWIFT_TOOLS_PATH} /../lib/swift/${SWIFTLIB_SINGLE_SUBDIR} "
1167
1167
"${SWIFT_NATIVE_SWIFT_TOOLS_PATH} /../lib/swift/${SWIFT_SDK_${SWIFTLIB_SINGLE_SDK} _LIB_SUBDIR}" )
1168
- swift_target_link_search_directories (${target_static}
1169
- ${library_search_directories} )
1168
+ swift_target_link_search_directories ("${target_static} " "${library_search_directories} " )
1170
1169
target_link_libraries ("${target_static} " PRIVATE
1171
1170
${SWIFTLIB_SINGLE_PRIVATE_LINK_LIBRARIES} )
1172
1171
endif ()
0 commit comments