diff options
| author | Brad King <brad.king@kitware.com> | 2017-02-24 15:16:24 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2017-02-24 15:16:24 (GMT) |
| commit | 52a3022df62c0b2ec6c51f70e8eb862dbcde3c9a (patch) | |
| tree | 379f4afaf2ab4612a3e90745d557e5e873e90834 | |
| parent | efac65d67b32c407044db6536da4f43ed9546be7 (diff) | |
| parent | 666ad1df2dc5b181a40d831c125529fe7e9bf0b4 (diff) | |
| download | CMake-52a3022df62c0b2ec6c51f70e8eb862dbcde3c9a.zip CMake-52a3022df62c0b2ec6c51f70e8eb862dbcde3c9a.tar.gz CMake-52a3022df62c0b2ec6c51f70e8eb862dbcde3c9a.tar.bz2 | |
Merge branch 'ninja-no-full-path' into release-3.7
| -rw-r--r-- | Source/cmNinjaTargetGenerator.cxx | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/Source/cmNinjaTargetGenerator.cxx b/Source/cmNinjaTargetGenerator.cxx index 46a6161..5c85dfa 100644 --- a/Source/cmNinjaTargetGenerator.cxx +++ b/Source/cmNinjaTargetGenerator.cxx @@ -377,7 +377,7 @@ void cmNinjaTargetGenerator::WriteCompileRule(const std::string& lang) vars.RuleLauncher = "RULE_LAUNCH_COMPILE"; vars.CMTarget = this->GetGeneratorTarget(); vars.Language = lang.c_str(); - vars.Source = "$IN_ABS"; + vars.Source = "$in"; vars.Object = "$out"; vars.Defines = "$DEFINES"; vars.Includes = "$INCLUDES"; @@ -729,7 +729,8 @@ void cmNinjaTargetGenerator::WriteObjectBuildStatement( cmSourceFile const* source, bool writeOrderDependsTargetForTarget) { std::string const language = source->GetLanguage(); - std::string const sourceFileName = this->GetSourceFilePath(source); + std::string const sourceFileName = + language == "RC" ? source->GetFullPath() : this->GetSourceFilePath(source); std::string const objectDir = this->ConvertToNinjaPath(this->GeneratorTarget->GetSupportDirectory()); std::string const objectFileName = @@ -738,8 +739,6 @@ void cmNinjaTargetGenerator::WriteObjectBuildStatement( cmSystemTools::GetFilenamePath(objectFileName); cmNinjaVars vars; - vars["IN_ABS"] = this->GetLocalGenerator()->ConvertToOutputFormat( - source->GetFullPath(), cmOutputConverter::SHELL); vars["FLAGS"] = this->ComputeFlagsForObject(source, language); vars["DEFINES"] = this->ComputeDefines(source, language); vars["INCLUDES"] = this->GetIncludes(language); |