Skip to content

Commit e85e9e1

Browse files
Fix swift_target_link_search_directories issue appending just the last directory.
STLD_FLAGS wasn't being appended, but replaced.
1 parent b057252 commit e85e9e1

File tree

1 file changed

+3
-4
lines changed

1 file changed

+3
-4
lines changed

cmake/modules/AddSwift.cmake

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -465,7 +465,7 @@ endfunction()
465465
function(swift_target_link_search_directories target directories)
466466
set(STLD_FLAGS "")
467467
foreach(directory ${directories})
468-
set(STLD_FLAGS " ${CMAKE_LIBRARY_PATH_FLAG}${directory}")
468+
set(STLD_FLAGS "${STLD_FLAGS} ${CMAKE_LIBRARY_PATH_FLAG}${directory}")
469469
endforeach()
470470
set_property(TARGET ${target} APPEND_STRING PROPERTY LINK_FLAGS ${STLD_FLAGS})
471471
endfunction()
@@ -1109,7 +1109,7 @@ function(_add_swift_library_single target name)
11091109
COMPILE_FLAGS " ${c_compile_flags}")
11101110
set_property(TARGET "${target}" APPEND_STRING PROPERTY
11111111
LINK_FLAGS " ${link_flags}")
1112-
swift_target_link_search_directories(${target} ${library_search_directories})
1112+
swift_target_link_search_directories("${target}" "${library_search_directories}")
11131113

11141114
# Adjust the linked libraries for windows targets. On Windows, the link is
11151115
# performed against the import library, and the runtime uses the dll. Not
@@ -1165,8 +1165,7 @@ function(_add_swift_library_single target name)
11651165
"${SWIFTSTATICLIB_DIR}/${SWIFTLIB_SINGLE_SUBDIR}"
11661166
"${SWIFT_NATIVE_SWIFT_TOOLS_PATH}/../lib/swift/${SWIFTLIB_SINGLE_SUBDIR}"
11671167
"${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}")
11701169
target_link_libraries("${target_static}" PRIVATE
11711170
${SWIFTLIB_SINGLE_PRIVATE_LINK_LIBRARIES})
11721171
endif()

0 commit comments

Comments
 (0)