diff options
| author | Peter Kuemmel <syntheticpp@gmx.net> | 2012-02-19 18:21:05 (GMT) |
|---|---|---|
| committer | Peter Kuemmel <syntheticpp@gmx.net> | 2012-02-19 18:21:05 (GMT) |
| commit | 21997cea4d8694077e8bcf9ba4cbd3d96a3f163c (patch) | |
| tree | fbed02f39c3fe7974dc31b3bbb7c30632fdc70e7 /Source | |
| parent | 3b847415154b13e401bf9f71042578ad21c9c1c9 (diff) | |
| download | CMake-21997cea4d8694077e8bcf9ba4cbd3d96a3f163c.zip CMake-21997cea4d8694077e8bcf9ba4cbd3d96a3f163c.tar.gz CMake-21997cea4d8694077e8bcf9ba4cbd3d96a3f163c.tar.bz2 | |
Ninja: mark the Windows specific hacks with a comment only
Diffstat (limited to 'Source')
| -rw-r--r-- | Source/cmNinjaNormalTargetGenerator.cxx | 3 | ||||
| -rw-r--r-- | Source/cmNinjaTargetGenerator.cxx | 5 |
2 files changed, 6 insertions, 2 deletions
diff --git a/Source/cmNinjaNormalTargetGenerator.cxx b/Source/cmNinjaNormalTargetGenerator.cxx index 97b46bf..66714e9 100644 --- a/Source/cmNinjaNormalTargetGenerator.cxx +++ b/Source/cmNinjaNormalTargetGenerator.cxx @@ -172,7 +172,8 @@ cmNinjaNormalTargetGenerator i != linkCmds.end(); ++i) { -#ifdef ENABLE_WIN32_NINJA_HACKS +#ifdef _WIN32 + // TODO TARGET_IMPLIB is empty cmSystemTools::ReplaceString(*i, "/implib:", ""); #endif this->GetLocalGenerator()->ExpandRuleVariables(*i, vars); diff --git a/Source/cmNinjaTargetGenerator.cxx b/Source/cmNinjaTargetGenerator.cxx index cc6024b..1a8d13d 100644 --- a/Source/cmNinjaTargetGenerator.cxx +++ b/Source/cmNinjaTargetGenerator.cxx @@ -224,11 +224,14 @@ cmNinjaDeps cmNinjaTargetGenerator::ComputeLinkDeps() const return cmNinjaDeps(); -#ifndef ENABLE_WIN32_NINJA_HACKS +#ifndef _WIN32 const std::vector<std::string> &deps = cli->GetDepends(); cmNinjaDeps result(deps.size()); std::transform(deps.begin(), deps.end(), result.begin(), MapToNinjaPath()); #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; for(unsigned i = 0; i < cli->GetItems().size(); ++i) { if( cli->GetItems()[i].Target ) { |