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 d59716d907dc6f5d28ee28829763cf1906505721 (commit)
via f19c189e74a685c9f2fa5ffdca159e75f6f5be5c (commit)
via 0a3dd07fb6b26694c46c5a23cf19d7f4641d91d3 (commit)
via c79032438c5f90ca957b1a02886e60835d5d6e47 (commit)
via 5803a8a2f7e0894810e9bd2e8c433dce7346cf76 (commit)
via 47e28cbe1faf7b70bda0d7d88db1d146d69a0123 (commit)
via 6814567e8c1c73c09e98ebcd1296e4fda717f0a4 (commit)
via c8741e8ff5ed93467812378413f1b3338c0ee6b2 (commit)
via be0d4042082db4dcd263dd181570b6f406202ed9 (commit)
from ae84427e3260342aa74aecaad28a27f11fafe569 (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=d59716d907dc6f5d28ee28829763cf1906505721
commit d59716d907dc6f5d28ee28829763cf1906505721
Merge: 0a3dd07 f19c189
Author: Brad King <brad.k...@kitware.com>
AuthorDate: Thu Jul 18 11:50:33 2019 +0000
Commit: Kitware Robot <kwro...@kitware.com>
CommitDate: Thu Jul 18 07:50:40 2019 -0400
Merge topic 'swift-improvements'
f19c189e74 Merge branch 'backport-swift-improvements' into
swift-improvements
5803a8a2f7 Swift: support SONAME on ELFish targets
47e28cbe1f Swift: support multithreaded compilation
6814567e8c Swift: add rules for static linking
c8741e8ff5 Swift: Add library search paths for dependencies
be0d404208 Support per-language library link flags
Acked-by: Kitware Robot <kwro...@kitware.com>
Merge-request: !3568
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=f19c189e74a685c9f2fa5ffdca159e75f6f5be5c
commit f19c189e74a685c9f2fa5ffdca159e75f6f5be5c
Merge: 0a3dd07 5803a8a
Author: Brad King <brad.k...@kitware.com>
AuthorDate: Thu Jul 18 07:46:42 2019 -0400
Commit: Brad King <brad.k...@kitware.com>
CommitDate: Thu Jul 18 07:46:42 2019 -0400
Merge branch 'backport-swift-improvements' into swift-improvements
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=0a3dd07fb6b26694c46c5a23cf19d7f4641d91d3
commit 0a3dd07fb6b26694c46c5a23cf19d7f4641d91d3
Merge: ae84427 c790324
Author: Brad King <brad.k...@kitware.com>
AuthorDate: Thu Jul 18 07:43:40 2019 -0400
Commit: Brad King <brad.k...@kitware.com>
CommitDate: Thu Jul 18 07:43:40 2019 -0400
Merge branch 'release-3.15'
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=5803a8a2f7e0894810e9bd2e8c433dce7346cf76
commit 5803a8a2f7e0894810e9bd2e8c433dce7346cf76
Author: Saleem Abdulrasool <compn...@compnerd.org>
AuthorDate: Thu Jul 11 11:12:26 2019 -0700
Commit: Saleem Abdulrasool <compn...@compnerd.org>
CommitDate: Wed Jul 17 20:46:25 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()
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=47e28cbe1faf7b70bda0d7d88db1d146d69a0123
commit 47e28cbe1faf7b70bda0d7d88db1d146d69a0123
Author: Saleem Abdulrasool <compn...@compnerd.org>
AuthorDate: Sun Jun 30 20:50:08 2019 -0700
Commit: Saleem Abdulrasool <compn...@compnerd.org>
CommitDate: Wed Jul 17 20:46:08 2019 -0700
Swift: support multithreaded compilation
Query the number of logical CPUs available to enable parallel
compilation for Swift.
diff --git a/Help/manual/cmake-variables.7.rst
b/Help/manual/cmake-variables.7.rst
index 75ddd5d..e3c2f9f 100644
--- a/Help/manual/cmake-variables.7.rst
+++ b/Help/manual/cmake-variables.7.rst
@@ -98,6 +98,7 @@ Variables that Provide Information
/variable/CMAKE_STATIC_LIBRARY_PREFIX
/variable/CMAKE_STATIC_LIBRARY_SUFFIX
/variable/CMAKE_Swift_MODULE_DIRECTORY
+ /variable/CMAKE_Swift_NUM_THREADS
/variable/CMAKE_TOOLCHAIN_FILE
/variable/CMAKE_TWEAK_VERSION
/variable/CMAKE_VERBOSE_MAKEFILE
diff --git a/Help/variable/CMAKE_Swift_NUM_THREADS.rst
b/Help/variable/CMAKE_Swift_NUM_THREADS.rst
new file mode 100644
index 0000000..cb33678
--- /dev/null
+++ b/Help/variable/CMAKE_Swift_NUM_THREADS.rst
@@ -0,0 +1,8 @@
+CMAKE_Swift_NUM_THREADS
+-----------------------
+
+Number of threads for parallel compilation for Swift targets.
+
+This variable controls the number of parallel jobs that the swift driver
creates
+for building targets. If not specified, it will default to the number of
+logical CPUs on the host.
diff --git a/Modules/CMakeSwiftInformation.cmake
b/Modules/CMakeSwiftInformation.cmake
index f62f61b..0f84cce 100644
--- a/Modules/CMakeSwiftInformation.cmake
+++ b/Modules/CMakeSwiftInformation.cmake
@@ -49,11 +49,15 @@ if(NOT CMAKE_Swift_COMPILE_OBJECT)
set(CMAKE_Swift_COMPILE_OBJECT ":")
endif()
+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(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 -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> <LINK_LIBRARIES>")
else()
- set(CMAKE_Swift_CREATE_SHARED_LIBRARY "${CMAKE_Swift_COMPILER}
-output-file-map <SWIFT_OUTPUT_FILE_MAP> -incremental -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> <LINK_LIBRARIES>")
endif()
endif()
@@ -63,17 +67,17 @@ endif()
if(NOT CMAKE_Swift_LINK_EXECUTABLE)
if(CMAKE_Swift_COMPILER_TARGET)
- set(CMAKE_Swift_LINK_EXECUTABLE "${CMAKE_Swift_COMPILER} -target
<CMAKE_Swift_COMPILER_TARGET> -output-file-map <SWIFT_OUTPUT_FILE_MAP>
-incremental -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} -target
<CMAKE_Swift_COMPILER_TARGET> -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>")
else()
- set(CMAKE_Swift_LINK_EXECUTABLE "${CMAKE_Swift_COMPILER} -output-file-map
<SWIFT_OUTPUT_FILE_MAP> -incremental -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>
<LINK_LIBRARIES>")
endif()
endif()
if(NOT CMAKE_Swift_CREATE_STATIC_LIBRARY)
if(CMAKE_Swift_COMPILER_TARGET)
- set(CMAKE_Swift_CREATE_STATIC_LIBRARY "${CMAKE_Swift_COMPILER} -target
<CMAKE_Swift_COMPILER_TARGET> -output-file-map <SWIFT_OUTPUT_FILE_MAP>
-incremental -emit-library -static -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_STATIC_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 -static -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>")
else()
- set(CMAKE_Swift_CREATE_STATIC_LIBRARY "${CMAKE_Swift_COMPILER}
-output-file-map <SWIFT_OUTPUT_FILE_MAP> -incremental -emit-library -static -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_STATIC_LIBRARY "${CMAKE_Swift_COMPILER}
-output-file-map <SWIFT_OUTPUT_FILE_MAP> -incremental -num-threads
${CMAKE_Swift_NUM_THREADS} -emit-library -static -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>")
endif()
set(CMAKE_Swift_ARCHIVE_CREATE "<CMAKE_AR> crs <TARGET> <OBJECTS>")
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=6814567e8c1c73c09e98ebcd1296e4fda717f0a4
commit 6814567e8c1c73c09e98ebcd1296e4fda717f0a4
Author: Saleem Abdulrasool <compn...@compnerd.org>
AuthorDate: Thu Jun 27 21:28:48 2019 -0700
Commit: Saleem Abdulrasool <compn...@compnerd.org>
CommitDate: Wed Jul 17 20:45:54 2019 -0700
Swift: add rules for static linking
The Swift driver recently learnt how to generate static libraries using
the `-static` flag. This enables us to generate proper static libraries
with dependency tracking with Swift as well.
diff --git a/Modules/CMakeSwiftInformation.cmake
b/Modules/CMakeSwiftInformation.cmake
index 6f99c1f..f62f61b 100644
--- a/Modules/CMakeSwiftInformation.cmake
+++ b/Modules/CMakeSwiftInformation.cmake
@@ -70,6 +70,12 @@ if(NOT CMAKE_Swift_LINK_EXECUTABLE)
endif()
if(NOT CMAKE_Swift_CREATE_STATIC_LIBRARY)
+ if(CMAKE_Swift_COMPILER_TARGET)
+ set(CMAKE_Swift_CREATE_STATIC_LIBRARY "${CMAKE_Swift_COMPILER} -target
<CMAKE_Swift_COMPILER_TARGET> -output-file-map <SWIFT_OUTPUT_FILE_MAP>
-incremental -emit-library -static -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>")
+ else()
+ set(CMAKE_Swift_CREATE_STATIC_LIBRARY "${CMAKE_Swift_COMPILER}
-output-file-map <SWIFT_OUTPUT_FILE_MAP> -incremental -emit-library -static -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>")
+ endif()
+
set(CMAKE_Swift_ARCHIVE_CREATE "<CMAKE_AR> crs <TARGET> <OBJECTS>")
set(CMAKE_Swift_ARCHIVE_FINISH "")
endif()
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=c8741e8ff5ed93467812378413f1b3338c0ee6b2
commit c8741e8ff5ed93467812378413f1b3338c0ee6b2
Author: Saleem Abdulrasool <compn...@compnerd.org>
AuthorDate: Sun Jun 9 12:51:00 2019 -0700
Commit: Saleem Abdulrasool <compn...@compnerd.org>
CommitDate: Wed Jul 17 20:45:19 2019 -0700
Swift: Add library search paths for dependencies
When building Swift executables and libraries which import a module, an
implicit link will be added by the driver. Because this links by name
rather than path, the library search path needs to be provided to
indicate where to find the library. For all local dependencies, add the
library paths for the targets when linking. This ensures that you can
link against local libraries without explicitly setting a library path.
Fixes: #19304
diff --git a/Source/cmLinkLineComputer.cxx b/Source/cmLinkLineComputer.cxx
index 2a8bee6..469faca 100644
--- a/Source/cmLinkLineComputer.cxx
+++ b/Source/cmLinkLineComputer.cxx
@@ -99,14 +99,34 @@ std::string cmLinkLineComputer::ComputeLinkPath(
std::string const& libPathTerminator)
{
std::string linkPath;
- std::vector<std::string> const& libDirs = cli.GetDirectories();
- for (std::string const& libDir : libDirs) {
- std::string libpath = this->ConvertToOutputForExisting(libDir);
- linkPath += " " + libPathFlag;
- linkPath += libpath;
- linkPath += libPathTerminator;
- linkPath += " ";
+
+ if (cli.GetLinkLanguage() == "Swift") {
+ for (const cmComputeLinkInformation::Item& item : cli.GetItems()) {
+ const cmGeneratorTarget* target = item.Target;
+ if (!target) {
+ continue;
+ }
+
+ if (target->GetType() == cmStateEnums::STATIC_LIBRARY ||
+ target->GetType() == cmStateEnums::SHARED_LIBRARY) {
+ cmStateEnums::ArtifactType type = cmStateEnums::RuntimeBinaryArtifact;
+ if (target->GetType() == cmStateEnums::SHARED_LIBRARY &&
+ target->IsDLLPlatform()) {
+ type = cmStateEnums::ImportLibraryArtifact;
+ }
+
+ linkPath += " " + libPathFlag +
+ item.Target->GetDirectory(cli.GetConfig(), type) +
+ libPathTerminator + " ";
+ }
+ }
}
+
+ for (std::string const& libDir : cli.GetDirectories()) {
+ linkPath += " " + libPathFlag + this->ConvertToOutputForExisting(libDir) +
+ libPathTerminator + " ";
+ }
+
return linkPath;
}
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=be0d4042082db4dcd263dd181570b6f406202ed9
commit be0d4042082db4dcd263dd181570b6f406202ed9
Author: Saleem Abdulrasool <compn...@compnerd.org>
AuthorDate: Wed Jun 5 22:01:16 2019 -0700
Commit: Saleem Abdulrasool <compn...@compnerd.org>
CommitDate: Wed Jul 17 20:44:58 2019 -0700
Support per-language library link flags
This changes the behaviour of the generators to use a per-language
library search path flag. This is needed for multi-language projects
with different compilers (e.g. cl + gfortran). Since the adjusted
variable has been part of the user settings, we control this based on a
policy.
Fixes: #19307
diff --git a/Modules/CMakeSwiftInformation.cmake
b/Modules/CMakeSwiftInformation.cmake
index 21f18d4..6f99c1f 100644
--- a/Modules/CMakeSwiftInformation.cmake
+++ b/Modules/CMakeSwiftInformation.cmake
@@ -23,6 +23,8 @@ set(CMAKE_Swift_COMPILE_OPTIONS_TARGET "-target ")
set(CMAKE_Swift_COMPILER_ARG1 -frontend)
set(CMAKE_Swift_DEFINE_FLAG -D)
set(CMAKE_Swift_FRAMEWORK_SEARCH_FLAG "-F ")
+set(CMAKE_Swift_LIBRARY_PATH_FLAG "-L ")
+set(CMAKE_Swift_LIBRARY_PATH_TERMINATOR "")
set(CMAKE_Swift_LINKER_WRAPPER_FLAG "-Xlinker" " ")
set(CMAKE_Swift_RESPONSE_FILE_LINK_FLAG @)
diff --git a/Source/cmLocalGenerator.cxx b/Source/cmLocalGenerator.cxx
index fe5c8af..3abf2dd 100644
--- a/Source/cmLocalGenerator.cxx
+++ b/Source/cmLocalGenerator.cxx
@@ -1444,10 +1444,23 @@ void cmLocalGenerator::OutputLinkLibraries(
std::string linkLanguage = cli.GetLinkLanguage();
- const std::string& libPathFlag =
- this->Makefile->GetRequiredDefinition("CMAKE_LIBRARY_PATH_FLAG");
- const std::string& libPathTerminator =
- this->Makefile->GetSafeDefinition("CMAKE_LIBRARY_PATH_TERMINATOR");
+ std::string libPathFlag;
+ if (const char* value = this->Makefile->GetDefinition(
+ "CMAKE_" + cli.GetLinkLanguage() + "_LIBRARY_PATH_FLAG")) {
+ libPathFlag = value;
+ } else {
+ libPathFlag =
+ this->Makefile->GetRequiredDefinition("CMAKE_LIBRARY_PATH_FLAG");
+ }
+
+ std::string libPathTerminator;
+ if (const char* value = this->Makefile->GetDefinition(
+ "CMAKE_" + cli.GetLinkLanguage() + "_LIBRARY_PATH_TERMINATOR")) {
+ libPathTerminator = value;
+ } else {
+ libPathTerminator =
+ this->Makefile->GetRequiredDefinition("CMAKE_LIBRARY_PATH_TERMINATOR");
+ }
// Add standard libraries for this language.
std::string standardLibsVar = "CMAKE_";
-----------------------------------------------------------------------
Summary of changes:
hooks/post-receive
--
CMake
_______________________________________________
Cmake-commits mailing list
Cmake-commits@cmake.org
https://cmake.org/mailman/listinfo/cmake-commits
