summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStephen Kelly <steveire@gmail.com>2016-10-06 20:25:05 (GMT)
committerStephen Kelly <steveire@gmail.com>2016-10-06 20:25:05 (GMT)
commit7f1cd3280cf484b5d565a12ae57022de018faa57 (patch)
tree23ee80b14887283c5232e08ac56ecb3d1df09d4f
parent2597bcf831dae6a0a7a212607ea4b926ec6b10e0 (diff)
downloadCMake-7f1cd3280cf484b5d565a12ae57022de018faa57.zip
CMake-7f1cd3280cf484b5d565a12ae57022de018faa57.tar.gz
CMake-7f1cd3280cf484b5d565a12ae57022de018faa57.tar.bz2
cmLocalGenerator: Rename local variable to be more appropriate
-rw-r--r--Source/cmLocalGenerator.cxx7
1 files changed, 3 insertions, 4 deletions
diff --git a/Source/cmLocalGenerator.cxx b/Source/cmLocalGenerator.cxx
index 6cc03e8..a0f6423 100644
--- a/Source/cmLocalGenerator.cxx
+++ b/Source/cmLocalGenerator.cxx
@@ -1531,7 +1531,7 @@ void cmLocalGenerator::OutputLinkLibraries(std::string& linkLibraries,
std::string cmLocalGenerator::GetLinkLibsCMP0065(
std::string const& linkLanguage, cmGeneratorTarget& tgt) const
{
- std::string linkLibs;
+ std::string linkFlags;
// Flags to link an executable to shared libraries.
if (tgt.GetType() == cmState::EXECUTABLE &&
@@ -1571,11 +1571,10 @@ std::string cmLocalGenerator::GetLinkLibsCMP0065(
std::string linkFlagsVar = "CMAKE_SHARED_LIBRARY_LINK_";
linkFlagsVar += linkLanguage;
linkFlagsVar += "_FLAGS";
- linkLibs = this->Makefile->GetSafeDefinition(linkFlagsVar);
- linkLibs += " ";
+ linkFlags = this->Makefile->GetSafeDefinition(linkFlagsVar);
}
}
- return linkLibs;
+ return linkFlags;
}
void cmLocalGenerator::AddArchitectureFlags(std::string& flags,