diff options
| -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 ) { |