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 c41c79285b5ebb7dd914a6e714aa553bb5078641 (commit)
via 5480f65ab1c7b7ffae624f9b7596b36370aa8c9b (commit)
from 1958c78fe1d600e1d1d4cde480907ac6fcad4a1e (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=c41c79285b5ebb7dd914a6e714aa553bb5078641
commit c41c79285b5ebb7dd914a6e714aa553bb5078641
Merge: 1958c78 5480f65
Author: Kyle Edwards <kyle.edwa...@kitware.com>
AuthorDate: Mon Aug 19 17:25:07 2019 +0000
Commit: Kitware Robot <kwro...@kitware.com>
CommitDate: Mon Aug 19 13:25:16 2019 -0400
Merge topic 'swift-import-library-location'
5480f65ab1 Swift: honour `IMPLIB_LOCATION` property
Acked-by: Kitware Robot <kwro...@kitware.com>
Acked-by: Ben Boeckel <ben.boec...@kitware.com>
Merge-request: !3686
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=5480f65ab1c7b7ffae624f9b7596b36370aa8c9b
commit 5480f65ab1c7b7ffae624f9b7596b36370aa8c9b
Author: Saleem Abdulrasool <compn...@compnerd.org>
AuthorDate: Sun Aug 11 22:27:46 2019 -0700
Commit: Saleem Abdulrasool <compn...@compnerd.org>
CommitDate: Sun Aug 11 22:29:49 2019 -0700
Swift: honour `IMPLIB_LOCATION` property
The rules did not account for the import library location (through
`<TARGET_IMPLB>`) and instead would always write the import library to
the default location (next to the shared library/executable). This
prevented the use of `CMAKE_RUNTIME_OUTPUT_LOCATION` and
`CMAKE_ARCHIVE_OUTPUT_LOCATION`.
diff --git a/Modules/CMakeSwiftInformation.cmake
b/Modules/CMakeSwiftInformation.cmake
index 54e441c..bf3ca40 100644
--- a/Modules/CMakeSwiftInformation.cmake
+++ b/Modules/CMakeSwiftInformation.cmake
@@ -64,8 +64,12 @@ if(NOT CMAKE_Swift_NUM_THREADS MATCHES "^[0-9]+$")
cmake_host_system_information(RESULT CMAKE_Swift_NUM_THREADS QUERY
NUMBER_OF_LOGICAL_CORES)
endif()
+if(CMAKE_SYSTEM_NAME STREQUAL Windows)
+ set(CMAKE_Swift_IMPLIB_LINKER_FLAGS "-Xlinker -implib:<TARGET_IMPLIB>")
+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 -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>")
+ 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>
${CMAKE_Swift_IMPLIB_LINKER_FLAGS} <LINK_LIBRARIES>")
endif()
if(NOT CMAKE_Swift_CREATE_SHARED_MODULE)
@@ -73,7 +77,7 @@ if(NOT CMAKE_Swift_CREATE_SHARED_MODULE)
endif()
if(NOT CMAKE_Swift_LINK_EXECUTABLE)
- set(CMAKE_Swift_LINK_EXECUTABLE "<CMAKE_Swift_COMPILER> -output-file-map
<SWIFT_OUTPUT_FILE_MAP> -incremental -num-threads ${CMAKE_Swift_NUM_THREADS}
-emit-executable -o <TARGET> -emit-module -emit-module-path <SWIFT_MODULE>
-emit-dependencies <DEFINES> <FLAGS> <INCLUDES> <SWIFT_SOURCES> <LINK_FLAGS>
<LINK_LIBRARIES>")
+ set(CMAKE_Swift_LINK_EXECUTABLE "<CMAKE_Swift_COMPILER> -output-file-map
<SWIFT_OUTPUT_FILE_MAP> -incremental -num-threads ${CMAKE_Swift_NUM_THREADS}
-emit-executable -o <TARGET> -emit-module -emit-module-path <SWIFT_MODULE>
-emit-dependencies <DEFINES> <FLAGS> <INCLUDES> <SWIFT_SOURCES> <LINK_FLAGS>
${CMAKE_Swift_IMPLIB_LINKER_FLAGS} <LINK_LIBRARIES>")
endif()
if(NOT CMAKE_Swift_CREATE_STATIC_LIBRARY)
-----------------------------------------------------------------------
Summary of changes:
Modules/CMakeSwiftInformation.cmake | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
hooks/post-receive
--
CMake
_______________________________________________
Cmake-commits mailing list
Cmake-commits@cmake.org
https://cmake.org/mailman/listinfo/cmake-commits
