diff options
| author | Peter Kümmel <syntheticpp@gmx.net> | 2012-07-17 16:54:56 (GMT) |
|---|---|---|
| committer | Peter Kümmel <syntheticpp@gmx.net> | 2012-07-17 16:54:56 (GMT) |
| commit | 74d1c88529caa6d048418ea36e09a1d446472d33 (patch) | |
| tree | ca0b465ae2ca70d8c54a9ebc411179085900e42a | |
| parent | 1cdeef795a9765091027656e5b904059da8fc1b1 (diff) | |
| download | CMake-74d1c88529caa6d048418ea36e09a1d446472d33.zip CMake-74d1c88529caa6d048418ea36e09a1d446472d33.tar.gz CMake-74d1c88529caa6d048418ea36e09a1d446472d33.tar.bz2 | |
Ninja: cmcldeps needs absolute paths for RCs
| -rw-r--r-- | Source/cmNinjaTargetGenerator.cxx | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/Source/cmNinjaTargetGenerator.cxx b/Source/cmNinjaTargetGenerator.cxx index 7eb3d9e..0d02039 100644 --- a/Source/cmNinjaTargetGenerator.cxx +++ b/Source/cmNinjaTargetGenerator.cxx @@ -469,7 +469,7 @@ cmNinjaTargetGenerator cmNinjaDeps emptyDeps; std::string comment; - const char* language = source->GetLanguage(); + const std::string language = source->GetLanguage(); std::string rule = this->LanguageCompilerRule(language); cmNinjaDeps outputs; @@ -479,7 +479,11 @@ cmNinjaTargetGenerator this->Objects.push_back(objectFileName); cmNinjaDeps explicitDeps; - std::string sourceFileName = this->GetSourceFilePath(source); + std::string sourceFileName; + if (language == "RC") + sourceFileName = source->GetFullPath(); + else + sourceFileName = this->GetSourceFilePath(source); explicitDeps.push_back(sourceFileName); // Ensure that the target dependencies are built before any source file in |