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

Merge topic 'ninja-implib-byproduct' 

35fb0bb8 Ninja: Make import libraries BYPRODUCTs instead of regular OUTPUTs
This commit is contained in:
Brad King 2015-07-29 10:29:30 -04:00 committed by CMake Topic Stage
parent 700d537e60 35fb0bb8c0
commit 8697dca7f1
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Source/cmNinjaNormalTargetGenerator.cxx
View File

@ -547,6 +547,8 @@ void cmNinjaNormalTargetGenerator::WriteLinkStatement()
}
}
cmNinjaDeps byproducts;
if (!this->TargetNameImport.empty())
{
const std::string impLibPath = localGen.ConvertToOutputFormat(
@ -556,7 +558,7 @@ void cmNinjaNormalTargetGenerator::WriteLinkStatement()
EnsureParentDirectoryExists(impLibPath);
if(target.HasImportLibrary())
{
outputs.push_back(targetOutputImplib);
byproducts.push_back(targetOutputImplib);
}
}
@ -602,7 +604,6 @@ void cmNinjaNormalTargetGenerator::WriteLinkStatement()
&postBuildCmdLines
};
cmNinjaDeps byproducts;
for (unsigned i = 0; i != 3; ++i)
{
for (std::vector<cmCustomCommand>::const_iterator