kolan/CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

cmGeneratorTarget: Add GetLinkDirectories API.

Browse Source
This commit is contained in:
Stephen Kelly 2015-10-23 00:49:58 +02:00
parent cf69630e51
commit bde277e811
4 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Source/cmComputeLinkInformation.cxx
View File

@ -377,9 +377,9 @@ cmComputeLinkInformation
// Add the search path entries requested by the user to path ordering. // Add the search path entries requested by the user to path ordering.
this->OrderLinkerSearchPath this->OrderLinkerSearchPath
->AddUserDirectories(this->Target->Target->GetLinkDirectories()); ->AddUserDirectories(this->Target->GetLinkDirectories());
this->OrderRuntimeSearchPath this->OrderRuntimeSearchPath
->AddUserDirectories(this->Target->Target->GetLinkDirectories()); ->AddUserDirectories(this->Target->GetLinkDirectories());
// Set up the implicit link directories. // Set up the implicit link directories.
this->LoadImplicitLinkInfo(); this->LoadImplicitLinkInfo();
@ -413,7 +413,7 @@ cmComputeLinkInformation
// Construct a mask to not bother with this behavior for link // Construct a mask to not bother with this behavior for link
// directories already specified by the user. // directories already specified by the user.
std::vector<std::string> const& dirs = std::vector<std::string> const& dirs =
this->Target->Target->GetLinkDirectories(); this->Target->GetLinkDirectories();
this->OldLinkDirMask.insert(dirs.begin(), dirs.end()); this->OldLinkDirMask.insert(dirs.begin(), dirs.end());
} }

5
Source/cmGeneratorTarget.cxx
View File

@ -1732,6 +1732,11 @@ cmListFileBacktrace cmGeneratorTarget::GetBacktrace() const
return this->Target->GetBacktrace(); return this->Target->GetBacktrace();
} }
const std::vector<std::string>&cmGeneratorTarget::GetLinkDirectories() const
{
return this->Target->GetLinkDirectories();
}
//---------------------------------------------------------------------------- //----------------------------------------------------------------------------
bool cmGeneratorTarget::HaveWellDefinedOutputFiles() const bool cmGeneratorTarget::HaveWellDefinedOutputFiles() const
{ {

2
Source/cmGeneratorTarget.h
View File

@ -184,6 +184,8 @@ public:
cmListFileBacktrace GetBacktrace() const; cmListFileBacktrace GetBacktrace() const;
const std::vector<std::string>& GetLinkDirectories() const;
/** Get the macro to define when building sources in this target. /** Get the macro to define when building sources in this target.
If no macro should be defined null is returned. */ If no macro should be defined null is returned. */
const char* GetExportMacro() const; const char* GetExportMacro() const;

2
Source/cmLocalVisualStudio6Generator.cxx
View File

@ -1052,7 +1052,7 @@ void cmLocalVisualStudio6Generator
} }
std::vector<std::string>::const_iterator i; std::vector<std::string>::const_iterator i;
const std::vector<std::string>& libdirs = const std::vector<std::string>& libdirs =
target->Target->GetLinkDirectories(); target->GetLinkDirectories();
for(i = libdirs.begin(); i != libdirs.end(); ++i) for(i = libdirs.begin(); i != libdirs.end(); ++i)
{ {
std::string path = *i; std::string path = *i;