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

BUG: When there are no link flags, we want an empty string, not a null pointer.

Browse Source
This commit is contained in:
Brad King 2002-12-31 12:59:02 -05:00
parent b290e5282c
commit c8694bb509
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Source/cmLocalUnixMakefileGenerator.cxx
View File

@ -1000,12 +1000,19 @@ void cmLocalUnixMakefileGenerator::OutputStaticLibraryRule(std::ostream& fout,
{ {
targetSuffix = this->GetSafeDefinition("CMAKE_STATIC_LIBRARY_SUFFIX"); targetSuffix = this->GetSafeDefinition("CMAKE_STATIC_LIBRARY_SUFFIX");
} }
std::string linkFlags;
const char* targetLinkFlags = t.GetProperty("LINK_FLAGS");
if(targetLinkFlags)
{
linkFlags += targetLinkFlags;
linkFlags += " ";
}
this->OutputLibraryRule(fout, name, t, this->OutputLibraryRule(fout, name, t,
targetPrefix, targetPrefix,
targetSuffix, targetSuffix,
createRule, createRule,
"static library", "static library",
t.GetProperty("LINK_FLAGS")); linkFlags.c_str());
} }