[Cmake-commits] CMake branch, next, updated. v3.1.1-2408-g0fa3dd3

[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  0fa3dd31464cbccc9bc401eabdfb75d94b5579bd (commit)
       via  94193f7375b8e3490a71cc8baf0ca42e3e070afe (commit)
      from  27da8cf2d3ddf34acd9eeccf630d83ccbf89cd38 (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 -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=0fa3dd31464cbccc9bc401eabdfb75d94b5579bd
commit 0fa3dd31464cbccc9bc401eabdfb75d94b5579bd
Merge: 27da8cf 94193f7
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Jan 28 09:06:16 2015 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Jan 28 09:06:16 2015 -0500

    Merge topic 'fix-OBJECT_DEPENDS-after-path-normalization' into next
    
    94193f73 fixup! Normalize OBJECT_DEPENDS paths to match custom commands (#15366)


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=94193f7375b8e3490a71cc8baf0ca42e3e070afe
commit 94193f7375b8e3490a71cc8baf0ca42e3e070afe
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Jan 28 08:58:54 2015 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Wed Jan 28 08:59:29 2015 -0500

    fixup! Normalize OBJECT_DEPENDS paths to match custom commands (#15366)

diff --git a/Source/cmNinjaTargetGenerator.cxx b/Source/cmNinjaTargetGenerator.cxx
index b8cc5fb..33000d6 100644
--- a/Source/cmNinjaTargetGenerator.cxx
+++ b/Source/cmNinjaTargetGenerator.cxx
@@ -600,6 +600,14 @@ cmNinjaTargetGenerator
   if(const char* objectDeps = source->GetProperty("OBJECT_DEPENDS")) {
     std::vector<std::string> depList;
     cmSystemTools::ExpandListArgument(objectDeps, depList);
+    for(std::vector<std::string>::iterator odi = depList.begin();
+        odi != depList.end(); ++odi)
+      {
+      if (cmSystemTools::FileIsFullPath(*odi))
+        {
+        *odi = cmSystemTools::CollapseFullPath(*odi);
+        }
+      }
     std::transform(depList.begin(), depList.end(),
                    std::back_inserter(implicitDeps), MapToNinjaPath());
   }

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

Summary of changes:
 Source/cmNinjaTargetGenerator.cxx |    8 ++++++++
 1 file changed, 8 insertions(+)


hooks/post-receive
-- 
CMake