Skip to content

Commit ad238ff

Browse files
authored
Merge pull request swiftlang#23677 from Rostepher/cleanup-xctest-cmake-hack
[Build System: CMake] Cleanup the install_name_dir special-casing for XCTest in add_swift_target_library.
2 parents f85ca6c + b0a533a commit ad238ff

File tree

1 file changed

+4
-6
lines changed

1 file changed

+4
-6
lines changed

cmake/modules/AddSwift.cmake

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1026,14 +1026,12 @@ function(_add_swift_library_single target name)
10261026
endforeach()
10271027
endif()
10281028

1029-
if(${SWIFTLIB_SINGLE_SDK} IN_LIST SWIFT_APPLE_PLATFORMS)
1029+
if(SWIFTLIB_SINGLE_SDK IN_LIST SWIFT_APPLE_PLATFORMS)
10301030
set(install_name_dir "@rpath")
10311031

1032-
if(SWIFTLIB_SINGLE_IS_STDLIB)
1033-
# Always use @rpath for XCTest.
1034-
if(NOT "${module_name}" STREQUAL "XCTest")
1035-
set(install_name_dir "${SWIFT_DARWIN_STDLIB_INSTALL_NAME_DIR}")
1036-
endif()
1032+
# Always use @rpath for XCTest
1033+
if(module_name STREQUAL "XCTest")
1034+
set(install_name_dir "@rpath")
10371035
endif()
10381036

10391037
set_target_properties("${target}"

0 commit comments

Comments
 (0)