summaryrefslogtreecommitdiffstats
path: root/Modules
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2024-08-02 13:47:40 (GMT)
committerKitware Robot <kwrobot@kitware.com>2024-08-02 13:47:50 (GMT)
commit35e908e0dc0930edb2b1e7db4fa8d67f00f9cc98 (patch)
tree6d1dbfe3bd78c3caa9bd8fd64b63597c53b80039 /Modules
parent97d096388884b07a1317a4721ec92e7b56f76d73 (diff)
parent866917657621ee74720f5abcee290b50341882c9 (diff)
downloadCMake-35e908e0dc0930edb2b1e7db4fa8d67f00f9cc98.zip
CMake-35e908e0dc0930edb2b1e7db4fa8d67f00f9cc98.tar.gz
CMake-35e908e0dc0930edb2b1e7db4fa8d67f00f9cc98.tar.bz2
Merge topic 'swift-install-names' into release-3.30
8669176576 Swift: Fix INSTALL_NAME_DIR under CMP0157 NEW behavior Acked-by: Kitware Robot <kwrobot@kitware.com> Tested-by: buildbot <buildbot@kitware.com> Merge-request: !9692
Diffstat (limited to 'Modules')
-rw-r--r--Modules/CMakeSwiftInformation.cmake2
1 files changed, 1 insertions, 1 deletions
diff --git a/Modules/CMakeSwiftInformation.cmake b/Modules/CMakeSwiftInformation.cmake
index 60df6a2..869a508 100644
--- a/Modules/CMakeSwiftInformation.cmake
+++ b/Modules/CMakeSwiftInformation.cmake
@@ -134,7 +134,7 @@ if(CMAKE_Swift_COMPILATION_MODE_DEFAULT)
endif()
if(NOT CMAKE_Swift_CREATE_SHARED_LIBRARY)
- set(CMAKE_Swift_CREATE_SHARED_LIBRARY "<CMAKE_Swift_COMPILER> ${CMAKE_Swift_PARALLEL_FLAGS} -emit-library <CMAKE_SHARED_LIBRARY_Swift_FLAGS> <LANGUAGE_COMPILE_FLAGS> <LINK_FLAGS> ${CMAKE_Swift_IMPLIB_LINKER_FLAGS} <SONAME_FLAG> <TARGET_SONAME> -o <TARGET> <OBJECTS> <LINK_LIBRARIES>")
+ set(CMAKE_Swift_CREATE_SHARED_LIBRARY "<CMAKE_Swift_COMPILER> ${CMAKE_Swift_PARALLEL_FLAGS} -emit-library <CMAKE_SHARED_LIBRARY_Swift_FLAGS> <LANGUAGE_COMPILE_FLAGS> <LINK_FLAGS> ${CMAKE_Swift_IMPLIB_LINKER_FLAGS} <SONAME_FLAG> <TARGET_INSTALLNAME_DIR><TARGET_SONAME> -o <TARGET> <OBJECTS> <LINK_LIBRARIES>")
endif()
if(NOT CMAKE_Swift_CREATE_SHARED_MODULE)