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

cmOrderDirectories: Port to cmGeneratorTarget.

Browse Source
This commit is contained in:
Stephen Kelly 2015-08-04 19:19:51 +02:00
parent f83e84028a
commit a309409ead
3 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Source/cmComputeLinkInformation.cxx
View File

@ -260,10 +260,10 @@ cmComputeLinkInformation
// Allocate internals. // Allocate internals.
this->OrderLinkerSearchPath = this->OrderLinkerSearchPath =
new cmOrderDirectories(this->GlobalGenerator, target->Target, new cmOrderDirectories(this->GlobalGenerator, target,
"linker search path"); "linker search path");
this->OrderRuntimeSearchPath = this->OrderRuntimeSearchPath =
new cmOrderDirectories(this->GlobalGenerator, target->Target, new cmOrderDirectories(this->GlobalGenerator, target,
"runtime search path"); "runtime search path");
this->OrderDependentRPath = 0; this->OrderDependentRPath = 0;
@ -370,7 +370,7 @@ cmComputeLinkInformation
{ {
this->SharedDependencyMode = SharedDepModeDir; this->SharedDependencyMode = SharedDepModeDir;
this->OrderDependentRPath = this->OrderDependentRPath =
new cmOrderDirectories(this->GlobalGenerator, target->Target, new cmOrderDirectories(this->GlobalGenerator, target,
"dependent library path"); "dependent library path");
} }

8
Source/cmOrderDirectories.cxx
View File

@ -280,7 +280,7 @@ bool cmOrderDirectoriesConstraintLibrary::FindConflict(std::string const& dir)
//---------------------------------------------------------------------------- //----------------------------------------------------------------------------
cmOrderDirectories::cmOrderDirectories(cmGlobalGenerator* gg, cmOrderDirectories::cmOrderDirectories(cmGlobalGenerator* gg,
cmTarget const* target, const cmGeneratorTarget* target,
const char* purpose) const char* purpose)
{ {
this->GlobalGenerator = gg; this->GlobalGenerator = gg;
@ -554,7 +554,8 @@ void cmOrderDirectories::FindImplicitConflicts()
<< text << text
<< "Some of these libraries may not be found correctly."; << "Some of these libraries may not be found correctly.";
this->GlobalGenerator->GetCMakeInstance() this->GlobalGenerator->GetCMakeInstance()
->IssueMessage(cmake::WARNING, w.str(), this->Target->GetBacktrace()); ->IssueMessage(cmake::WARNING, w.str(),
this->Target->Target->GetBacktrace());
} }
//---------------------------------------------------------------------------- //----------------------------------------------------------------------------
@ -635,5 +636,6 @@ void cmOrderDirectories::DiagnoseCycle()
} }
e << "Some of these libraries may not be found correctly."; e << "Some of these libraries may not be found correctly.";
this->GlobalGenerator->GetCMakeInstance() this->GlobalGenerator->GetCMakeInstance()
->IssueMessage(cmake::WARNING, e.str(), this->Target->GetBacktrace()); ->IssueMessage(cmake::WARNING, e.str(),
this->Target->Target->GetBacktrace());
} }

6
Source/cmOrderDirectories.h
View File

@ -19,7 +19,7 @@
class cmGlobalGenerator; class cmGlobalGenerator;
class cmOrderDirectoriesConstraint; class cmOrderDirectoriesConstraint;
class cmOrderDirectoriesConstraintLibrary; class cmOrderDirectoriesConstraintLibrary;
class cmTarget; class cmGeneratorTarget;
/** \class cmOrderDirectories /** \class cmOrderDirectories
* \brief Compute a safe runtime path order for a set of shared libraries. * \brief Compute a safe runtime path order for a set of shared libraries.
@ -27,7 +27,7 @@ class cmTarget;
class cmOrderDirectories class cmOrderDirectories
{ {
public: public:
cmOrderDirectories(cmGlobalGenerator* gg, cmTarget const* target, cmOrderDirectories(cmGlobalGenerator* gg, cmGeneratorTarget const* target,
const char* purpose); const char* purpose);
~cmOrderDirectories(); ~cmOrderDirectories();
void AddRuntimeLibrary(std::string const& fullPath, const char* soname = 0); void AddRuntimeLibrary(std::string const& fullPath, const char* soname = 0);
@ -41,7 +41,7 @@ public:
std::vector<std::string> const& GetOrderedDirectories(); std::vector<std::string> const& GetOrderedDirectories();
private: private:
cmGlobalGenerator* GlobalGenerator; cmGlobalGenerator* GlobalGenerator;
cmTarget const* Target; cmGeneratorTarget const* Target;
std::string Purpose; std::string Purpose;
std::vector<std::string> OrderedDirectories; std::vector<std::string> OrderedDirectories;