diff options
| author | Ben Boeckel <ben.boeckel@kitware.com> | 2016-10-13 16:42:54 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2016-10-13 17:03:57 (GMT) |
| commit | 9977899df2c6c7687353882eff01150546ef42a9 (patch) | |
| tree | 45c4412debdaf59ef7002791f4dc24bf75adb60d /Source/cmNinjaTargetGenerator.cxx | |
| parent | b99bbfe88d1bb02dc903507f3e1bbe716ac04c12 (diff) | |
| download | CMake-9977899df2c6c7687353882eff01150546ef42a9.zip CMake-9977899df2c6c7687353882eff01150546ef42a9.tar.gz CMake-9977899df2c6c7687353882eff01150546ef42a9.tar.bz2 | |
Ninja: Fix RC language depfile generation with cmcldeps
In commit v3.7.0-rc1~275^2 (Ninja: Use full path for all source files,
2016-08-05), the source path was changed to use an absolute path.
Inside of `cmcldeps` for `.rc` file compilation, it uses a separate
argument for the path to the source file. This ended up causing
`cmcldeps` to transform the following call:
cmcldeps.exe RC source.rc ... C:/full/path/to/source.rc
into:
... C:/full/path/to//Tc source.rc
which is invalid. Update the source filename to use the full path to
the source file so that the path is replaced properly.
Diffstat (limited to 'Source/cmNinjaTargetGenerator.cxx')
| -rw-r--r-- | Source/cmNinjaTargetGenerator.cxx | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Source/cmNinjaTargetGenerator.cxx b/Source/cmNinjaTargetGenerator.cxx index fb2581d..46a6161 100644 --- a/Source/cmNinjaTargetGenerator.cxx +++ b/Source/cmNinjaTargetGenerator.cxx @@ -427,7 +427,7 @@ void cmNinjaTargetGenerator::WriteCompileRule(const std::string& lang) : mf->GetSafeDefinition("CMAKE_CXX_COMPILER"); cldeps = "\""; cldeps += cmSystemTools::GetCMClDepsCommand(); - cldeps += "\" " + lang + " $in \"$DEP_FILE\" $out \""; + cldeps += "\" " + lang + " " + vars.Source + " \"$DEP_FILE\" $out \""; cldeps += mf->GetSafeDefinition("CMAKE_CL_SHOWINCLUDES_PREFIX"); cldeps += "\" \"" + cl + "\" "; } |