diff options
author | Brad King <brad.king@kitware.com> | 2019-11-18 18:41:58 (GMT) |
---|---|---|
committer | Kitware Robot <kwrobot@kitware.com> | 2019-11-18 18:42:08 (GMT) |
commit | 4bbd9e9ec4cf234df82f7d25449f3f3a8406979a (patch) | |
tree | eae2bfe28107785288629f1d12d3cee1fefcf8b3 /Modules/CMakeSwiftInformation.cmake | |
parent | e64d39eb42a13f3a8d0e3d005a2936a27a2c8257 (diff) | |
parent | f935de6746f676dd435c09ca161a46aa289faf3b (diff) | |
download | CMake-4bbd9e9ec4cf234df82f7d25449f3f3a8406979a.zip CMake-4bbd9e9ec4cf234df82f7d25449f3f3a8406979a.tar.gz CMake-4bbd9e9ec4cf234df82f7d25449f3f3a8406979a.tar.bz2 |
Merge topic 'swift-darwin-install-name' into release-3.16
f935de6746 Swift: support `INSTALL_NAME_DIR` on Darwin
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4060
Diffstat (limited to 'Modules/CMakeSwiftInformation.cmake')
-rw-r--r-- | Modules/CMakeSwiftInformation.cmake | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Modules/CMakeSwiftInformation.cmake b/Modules/CMakeSwiftInformation.cmake index f2bf232..5489bd7 100644 --- a/Modules/CMakeSwiftInformation.cmake +++ b/Modules/CMakeSwiftInformation.cmake @@ -77,7 +77,7 @@ if(CMAKE_SYSTEM_NAME STREQUAL Windows) endif() if(NOT CMAKE_Swift_CREATE_SHARED_LIBRARY) - set(CMAKE_Swift_CREATE_SHARED_LIBRARY "<CMAKE_Swift_COMPILER> -output-file-map <SWIFT_OUTPUT_FILE_MAP> -incremental -j ${CMAKE_Swift_NUM_THREADS} -emit-library -o <TARGET> -module-name <SWIFT_MODULE_NAME> -module-link-name <SWIFT_LIBRARY_NAME> -emit-module -emit-module-path <SWIFT_MODULE> -emit-dependencies <DEFINES> <FLAGS> <INCLUDES> <SWIFT_SOURCES> <LINK_FLAGS> <SONAME_FLAG> <TARGET_SONAME> ${CMAKE_Swift_IMPLIB_LINKER_FLAGS} <LINK_LIBRARIES>") + set(CMAKE_Swift_CREATE_SHARED_LIBRARY "<CMAKE_Swift_COMPILER> -output-file-map <SWIFT_OUTPUT_FILE_MAP> -incremental -j ${CMAKE_Swift_NUM_THREADS} -emit-library -o <TARGET> -module-name <SWIFT_MODULE_NAME> -module-link-name <SWIFT_LIBRARY_NAME> -emit-module -emit-module-path <SWIFT_MODULE> -emit-dependencies <DEFINES> <FLAGS> <INCLUDES> <SWIFT_SOURCES> <LINK_FLAGS> <SONAME_FLAG> <TARGET_INSTALLNAME_DIR><TARGET_SONAME> ${CMAKE_Swift_IMPLIB_LINKER_FLAGS} <LINK_LIBRARIES>") endif() if(NOT CMAKE_Swift_CREATE_SHARED_MODULE) |