echo/CMake
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Swift: Add library search paths for dependencies

Browse Source 
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
This commit is contained in:
Saleem Abdulrasool 2019-06-09 12:51:00 -07:00 committed by Brad King
parent 77e59e442d
commit 2746c61e6d
1 changed files with 27 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
Source/cmLinkLineComputer.cxx
View File

@ -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;
}