Skip to content

Commit bec25a1

Browse files
Ross BayerRostepher
authored andcommitted
Added a new argument to add_swift_target_library to control the install_name_dir.
1 parent 2123a42 commit bec25a1

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
@@ -739,6 +739,7 @@ function(_add_swift_library_single target name)
739739
DEPLOYMENT_VERSION_TVOS
740740
DEPLOYMENT_VERSION_WATCHOS
741741
INSTALL_IN_COMPONENT
742+
LIBRARY_INSTALL_NAME_DIR
742743
MODULE_TARGET
743744
SDK)
744745
set(SWIFTLIB_SINGLE_multiple_parameter_options
@@ -1054,6 +1055,10 @@ function(_add_swift_library_single target name)
10541055
set(install_name_dir "@rpath")
10551056
endif()
10561057

1058+
if(SWIFTLIB_SINGLE_LIBRARY_INSTALL_NAME_DIR)
1059+
set(install_name_dir "${SWIFTLIB_SINGLE_LIBRARY_INSTALL_NAME_DIR}")
1060+
endif()
1061+
10571062
set_target_properties("${target}"
10581063
PROPERTIES
10591064
INSTALL_NAME_DIR "${install_name_dir}")
@@ -1619,7 +1624,8 @@ function(add_swift_target_library name)
16191624
DEPLOYMENT_VERSION_OSX
16201625
DEPLOYMENT_VERSION_TVOS
16211626
DEPLOYMENT_VERSION_WATCHOS
1622-
INSTALL_IN_COMPONENT)
1627+
INSTALL_IN_COMPONENT
1628+
LIBRARY_INSTALL_NAME_DIR)
16231629
set(SWIFTLIB_multiple_parameter_options
16241630
C_COMPILE_FLAGS
16251631
DEPENDS
@@ -1921,6 +1927,7 @@ function(add_swift_target_library name)
19211927
${SWIFTLIB_TARGET_LIBRARY_keyword}
19221928
${SWIFTLIB_FORCE_BUILD_OPTIMIZED_keyword}
19231929
${SWIFTLIB_NOSWIFTRT_keyword}
1930+
LIBRARY_INSTALL_NAME_DIR "${SWIFTLIB_LIBRARY_INSTALL_NAME_DIR}"
19241931
INSTALL_IN_COMPONENT "${SWIFTLIB_INSTALL_IN_COMPONENT}"
19251932
DEPLOYMENT_VERSION_OSX "${SWIFTLIB_DEPLOYMENT_VERSION_OSX}"
19261933
DEPLOYMENT_VERSION_IOS "${SWIFTLIB_DEPLOYMENT_VERSION_IOS}"

0 commit comments

Comments
 (0)