This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".
The branch, master has been updated
via 1b8fdad269711da81a4f93526247e14057d7c0c7 (commit)
via 6af97178efda2b6979200be55c2532929bafa815 (commit)
from 0db8b7eb451467f461579b0cf75691187dce7e1b (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=1b8fdad269711da81a4f93526247e14057d7c0c7
commit 1b8fdad269711da81a4f93526247e14057d7c0c7
Merge: 0db8b7e 6af9717
Author: Brad King <brad.k...@kitware.com>
AuthorDate: Mon Jul 15 11:27:35 2019 +0000
Commit: Kitware Robot <kwro...@kitware.com>
CommitDate: Mon Jul 15 07:27:46 2019 -0400
Merge topic 'soname'
6af97178ef Swift: support SONAME on ELFish targets
Acked-by: Kitware Robot <kwro...@kitware.com>
Merge-request: !3543
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=6af97178efda2b6979200be55c2532929bafa815
commit 6af97178efda2b6979200be55c2532929bafa815
Author: Saleem Abdulrasool <compn...@compnerd.org>
AuthorDate: Thu Jul 11 11:12:26 2019 -0700
Commit: Saleem Abdulrasool <compn...@compnerd.org>
CommitDate: Thu Jul 11 11:12:26 2019 -0700
Swift: support SONAME on ELFish targets
We should enable the soname to be setup for ELF shared libraries.
Failure to do so generates binaries with incorrect names which prevents
loading.
diff --git a/Modules/CMakeSwiftInformation.cmake
b/Modules/CMakeSwiftInformation.cmake
index 0f84cce..f6510b9 100644
--- a/Modules/CMakeSwiftInformation.cmake
+++ b/Modules/CMakeSwiftInformation.cmake
@@ -18,6 +18,9 @@ if(CMAKE_Swift_COMPILER_ID)
endif()
set(CMAKE_INCLUDE_FLAG_Swift "-I ")
+if(NOT CMAKE_SYSTEM_NAME STREQUAL Windows AND NOT CMAKE_SYSTEM_NAME STREQUAL
Darwin)
+ set(CMAKE_SHARED_LIBRARY_SONAME_Swift_FLAG "-Xlinker -soname -Xlinker ")
+endif()
set(CMAKE_Swift_COMPILE_OPTIONS_TARGET "-target ")
set(CMAKE_Swift_COMPILER_ARG1 -frontend)
@@ -55,9 +58,9 @@ endif()
if(NOT CMAKE_Swift_CREATE_SHARED_LIBRARY)
if(CMAKE_Swift_COMPILER_TARGET)
- set(CMAKE_Swift_CREATE_SHARED_LIBRARY "${CMAKE_Swift_COMPILER} -target
<CMAKE_Swift_COMPILER_TARGET> -output-file-map <SWIFT_OUTPUT_FILE_MAP>
-incremental -num-threads ${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> <LINK_LIBRARIES>")
+ set(CMAKE_Swift_CREATE_SHARED_LIBRARY "${CMAKE_Swift_COMPILER} -target
<CMAKE_Swift_COMPILER_TARGET> -output-file-map <SWIFT_OUTPUT_FILE_MAP>
-incremental -num-threads ${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>
<LINK_LIBRARIES>")
else()
- set(CMAKE_Swift_CREATE_SHARED_LIBRARY "${CMAKE_Swift_COMPILER}
-output-file-map <SWIFT_OUTPUT_FILE_MAP> -incremental -num-threads
${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> <LINK_LIBRARIES>")
+ set(CMAKE_Swift_CREATE_SHARED_LIBRARY "${CMAKE_Swift_COMPILER}
-output-file-map <SWIFT_OUTPUT_FILE_MAP> -incremental -num-threads
${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>
<LINK_LIBRARIES>")
endif()
endif()
-----------------------------------------------------------------------
Summary of changes:
Modules/CMakeSwiftInformation.cmake | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
hooks/post-receive
--
CMake
_______________________________________________
Cmake-commits mailing list
Cmake-commits@cmake.org
https://cmake.org/mailman/listinfo/cmake-commits
