[Cmake-commits] CMake branch, next, updated. v3.7.0-rc1-454-g4edd6e2

[Brad King]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
       via  4edd6e2a616a192b207268dc6bf2d9d3bf7a3031 (commit)
       via  9977899df2c6c7687353882eff01150546ef42a9 (commit)
      from  ec4d7d2ff0b8442ed1f735376f22ea2ece1a9f8c (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=4edd6e2a616a192b207268dc6bf2d9d3bf7a3031
commit 4edd6e2a616a192b207268dc6bf2d9d3bf7a3031
Merge: ec4d7d2 9977899
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Oct 13 13:15:42 2016 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Oct 13 13:15:42 2016 -0400

    Merge topic 'ninja-rc-regression' into next
    
    9977899d Ninja: Fix RC language depfile generation with cmcldeps


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=9977899df2c6c7687353882eff01150546ef42a9
commit 9977899df2c6c7687353882eff01150546ef42a9
Author:     Ben Boeckel <ben.boeckel at kitware.com>
AuthorDate: Thu Oct 13 12:42:54 2016 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Thu Oct 13 13:03:57 2016 -0400

    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.

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 + "\" ";
     }

-----------------------------------------------------------------------

Summary of changes:
 Source/cmNinjaTargetGenerator.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)


hooks/post-receive
-- 
CMake