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

Ninja: don't shadow 'outputs' variable

This commit is contained in:
Peter Kuemmel 2012-07-06 10:16:45 +02:00 committed by David Cole
parent 9b311fbee6
commit 6b31d39551
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Source/cmNinjaNormalTargetGenerator.cxx
View File

@ -508,20 +508,20 @@ void cmNinjaNormalTargetGenerator::WriteLinkStatement()
emptyDeps, emptyDeps,
symlinkVars); symlinkVars);
} else { } else {
cmNinjaDeps outputs; cmNinjaDeps symlinks;
const std::string soName = this->GetTargetFilePath(this->TargetNameSO); const std::string soName = this->GetTargetFilePath(this->TargetNameSO);
// If one link has to be created. // If one link has to be created.
if (targetOutputReal == soName || targetOutput == soName) { if (targetOutputReal == soName || targetOutput == soName) {
symlinkVars["SONAME"] = soName; symlinkVars["SONAME"] = soName;
} else { } else {
symlinkVars["SONAME"] = ""; symlinkVars["SONAME"] = "";
outputs.push_back(soName); symlinks.push_back(soName);
} }
outputs.push_back(targetOutput); symlinks.push_back(targetOutput);
cmGlobalNinjaGenerator::WriteBuild(this->GetBuildFileStream(), cmGlobalNinjaGenerator::WriteBuild(this->GetBuildFileStream(),
"Create library symlink " + targetOutput, "Create library symlink " + targetOutput,
"CMAKE_SYMLINK_LIBRARY", "CMAKE_SYMLINK_LIBRARY",
outputs, symlinks,
cmNinjaDeps(1, targetOutputReal), cmNinjaDeps(1, targetOutputReal),
emptyDeps, emptyDeps,
emptyDeps, emptyDeps,