diff options
| author | Brad King <brad.king@kitware.com> | 2015-07-29 14:29:30 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2015-07-29 14:29:30 (GMT) |
| commit | 8697dca7f13026d2d160a1df9ecd047e404d255b (patch) | |
| tree | 2723fee57b895eb2cb134969b6b49829526f19d3 | |
| parent | 700d537e60896b1317df3271e3d3673a0920d4c7 (diff) | |
| parent | 35fb0bb8c09cfc5fd75ad87fac58799e5054b7ce (diff) | |
| download | CMake-8697dca7f13026d2d160a1df9ecd047e404d255b.zip CMake-8697dca7f13026d2d160a1df9ecd047e404d255b.tar.gz CMake-8697dca7f13026d2d160a1df9ecd047e404d255b.tar.bz2 | |
Merge topic 'ninja-implib-byproduct'
35fb0bb8 Ninja: Make import libraries BYPRODUCTs instead of regular OUTPUTs
| -rw-r--r-- | Source/cmNinjaNormalTargetGenerator.cxx | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/Source/cmNinjaNormalTargetGenerator.cxx b/Source/cmNinjaNormalTargetGenerator.cxx index 8ec6f5e..c9fa7c0 100644 --- a/Source/cmNinjaNormalTargetGenerator.cxx +++ b/Source/cmNinjaNormalTargetGenerator.cxx @@ -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 |