[Cmake-commits] [cmake-commits] king committed cmComputeLinkInformation.cxx 1.50 1.51 cmComputeLinkInformation.h 1.22 1.23
cmake-commits at cmake.org
cmake-commits at cmake.org
Tue Jul 14 10:14:55 EDT 2009
Update of /cvsroot/CMake/CMake/Source
In directory public:/mounts/ram/cvs-serv7686/Source
Modified Files:
cmComputeLinkInformation.cxx cmComputeLinkInformation.h
Log Message:
STYLE: Factor cmComputeLinkInformation constructor
This factors some code out of the constructor into a new method
cmComputeLinkInformation::LoadImplicitLinkInfo for readability.
Index: cmComputeLinkInformation.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmComputeLinkInformation.cxx,v
retrieving revision 1.50
retrieving revision 1.51
diff -C 2 -d -r1.50 -r1.51
*** cmComputeLinkInformation.cxx 8 Jul 2009 17:03:59 -0000 1.50
--- cmComputeLinkInformation.cxx 14 Jul 2009 14:14:52 -0000 1.51
***************
*** 366,384 ****
}
- // Get the implicit link directories for this platform.
- if(const char* implicitLinks =
- (this->Makefile->GetDefinition
- ("CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES")))
- {
- std::vector<std::string> implicitLinkVec;
- cmSystemTools::ExpandListArgument(implicitLinks, implicitLinkVec);
- for(std::vector<std::string>::const_iterator
- i = implicitLinkVec.begin();
- i != implicitLinkVec.end(); ++i)
- {
- this->ImplicitLinkDirs.insert(*i);
- }
- }
-
// Add the search path entries requested by the user to path ordering.
this->OrderLinkerSearchPath
--- 366,369 ----
***************
*** 386,389 ****
--- 371,377 ----
this->OrderRuntimeSearchPath
->AddUserDirectories(this->Target->GetLinkDirectories());
+
+ // Set up the implicit link directories.
+ this->LoadImplicitLinkInfo();
this->OrderLinkerSearchPath
->SetImplicitDirectories(this->ImplicitLinkDirs);
***************
*** 1552,1555 ****
--- 1540,1564 ----
//----------------------------------------------------------------------------
+ void cmComputeLinkInformation::LoadImplicitLinkInfo()
+ {
+ std::vector<std::string> implicitDirVec;
+
+ // Get platform-wide implicit directories.
+ if(const char* implicitLinks =
+ (this->Makefile->GetDefinition
+ ("CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES")))
+ {
+ cmSystemTools::ExpandListArgument(implicitLinks, implicitDirVec);
+ }
+
+ // Store implicit link directories.
+ for(std::vector<std::string>::const_iterator i = implicitDirVec.begin();
+ i != implicitDirVec.end(); ++i)
+ {
+ this->ImplicitLinkDirs.insert(*i);
+ }
+ }
+
+ //----------------------------------------------------------------------------
std::vector<std::string> const&
cmComputeLinkInformation::GetRuntimeSearchPath()
Index: cmComputeLinkInformation.h
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmComputeLinkInformation.h,v
retrieving revision 1.22
retrieving revision 1.23
diff -C 2 -d -r1.22 -r1.23
*** cmComputeLinkInformation.h 15 Sep 2008 17:30:07 -0000 1.22
--- cmComputeLinkInformation.h 14 Jul 2009 14:14:52 -0000 1.23
***************
*** 161,164 ****
--- 161,165 ----
bool FinishLinkerSearchDirectories();
void PrintLinkPolicyDiagnosis(std::ostream&);
+ void LoadImplicitLinkInfo();
std::set<cmStdString> ImplicitLinkDirs;
More information about the Cmake-commits
mailing list