Skip to content

Commit c090bc6

Browse files
Ross BayerRostepher
authored andcommitted
Added a new argument to add_swift_target_library to control the install_name_dir.
(cherry picked from commit bec25a1)
1 parent a1dc868 commit c090bc6

File tree

1 file changed

+8
-1
lines changed

1 file changed

+8
-1
lines changed

cmake/modules/AddSwift.cmake

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -713,6 +713,7 @@ function(_add_swift_library_single target name)
713713
DEPLOYMENT_VERSION_TVOS
714714
DEPLOYMENT_VERSION_WATCHOS
715715
INSTALL_IN_COMPONENT
716+
LIBRARY_INSTALL_NAME_DIR
716717
MODULE_TARGET
717718
SDK)
718719
set(SWIFTLIB_SINGLE_multiple_parameter_options
@@ -1033,6 +1034,10 @@ function(_add_swift_library_single target name)
10331034
set(install_name_dir "@rpath")
10341035
endif()
10351036

1037+
if(SWIFTLIB_SINGLE_LIBRARY_INSTALL_NAME_DIR)
1038+
set(install_name_dir "${SWIFTLIB_SINGLE_LIBRARY_INSTALL_NAME_DIR}")
1039+
endif()
1040+
10361041
set_target_properties("${target}"
10371042
PROPERTIES
10381043
INSTALL_NAME_DIR "${install_name_dir}")
@@ -1613,7 +1618,8 @@ function(add_swift_target_library name)
16131618
DEPLOYMENT_VERSION_OSX
16141619
DEPLOYMENT_VERSION_TVOS
16151620
DEPLOYMENT_VERSION_WATCHOS
1616-
INSTALL_IN_COMPONENT)
1621+
INSTALL_IN_COMPONENT
1622+
LIBRARY_INSTALL_NAME_DIR)
16171623
set(SWIFTLIB_multiple_parameter_options
16181624
C_COMPILE_FLAGS
16191625
DEPENDS
@@ -1911,6 +1917,7 @@ function(add_swift_target_library name)
19111917
${SWIFTLIB_TARGET_LIBRARY_keyword}
19121918
${SWIFTLIB_FORCE_BUILD_OPTIMIZED_keyword}
19131919
${SWIFTLIB_NOSWIFTRT_keyword}
1920+
LIBRARY_INSTALL_NAME_DIR "${SWIFTLIB_LIBRARY_INSTALL_NAME_DIR}"
19141921
INSTALL_IN_COMPONENT "${SWIFTLIB_INSTALL_IN_COMPONENT}"
19151922
DEPLOYMENT_VERSION_OSX "${SWIFTLIB_DEPLOYMENT_VERSION_OSX}"
19161923
DEPLOYMENT_VERSION_IOS "${SWIFTLIB_DEPLOYMENT_VERSION_IOS}"

0 commit comments

Comments
 (0)