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

Ninja: mark the Windows specific hacks with a comment only

Browse Source
This commit is contained in:
Peter Kuemmel 2012-02-19 19:21:05 +01:00
parent 3b84741515
commit 21997cea4d
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Source/cmNinjaNormalTargetGenerator.cxx
View File

@ -172,7 +172,8 @@ cmNinjaNormalTargetGenerator
i != linkCmds.end(); i != linkCmds.end();
++i) ++i)
{ {
#ifdef ENABLE_WIN32_NINJA_HACKS #ifdef _WIN32
// TODO TARGET_IMPLIB is empty
cmSystemTools::ReplaceString(*i, "/implib:", ""); cmSystemTools::ReplaceString(*i, "/implib:", "");
#endif #endif
this->GetLocalGenerator()->ExpandRuleVariables(*i, vars); this->GetLocalGenerator()->ExpandRuleVariables(*i, vars);

5
Source/cmNinjaTargetGenerator.cxx
View File

@ -224,11 +224,14 @@ cmNinjaDeps cmNinjaTargetGenerator::ComputeLinkDeps() const
return cmNinjaDeps(); return cmNinjaDeps();
#ifndef ENABLE_WIN32_NINJA_HACKS #ifndef _WIN32
const std::vector<std::string> &deps = cli->GetDepends(); const std::vector<std::string> &deps = cli->GetDepends();
cmNinjaDeps result(deps.size()); cmNinjaDeps result(deps.size());
std::transform(deps.begin(), deps.end(), result.begin(), MapToNinjaPath()); std::transform(deps.begin(), deps.end(), result.begin(), MapToNinjaPath());
#else #else
// TODO The ninja generator misses a lot on Windows.
// This hack avoids a problem when a Dll is build:
// It builds the .dll but uses the .lib which is then unknown to ninja.
cmNinjaDeps result; cmNinjaDeps result;
for(unsigned i = 0; i < cli->GetItems().size(); ++i) { for(unsigned i = 0; i < cli->GetItems().size(); ++i) {
if( cli->GetItems()[i].Target ) { if( cli->GetItems()[i].Target ) {