[Cmake-commits] CMake branch, next, updated. v2.8.9-1085-g316f5b0

[Alexander Neundorf]

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  316f5b036fb9ebe3dd444c103b1388111754faa7 (commit)
       via  3446cb514bd2a4fd8538fd62ee9cf674268657d6 (commit)
      from  2052bd49ea88f13900429bdfd22a0e66549a5984 (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=316f5b036fb9ebe3dd444c103b1388111754faa7
commit 316f5b036fb9ebe3dd444c103b1388111754faa7
Merge: 2052bd4 3446cb5
Author:     Alexander Neundorf <neundorf at kde.org>
AuthorDate: Sun Oct 14 15:19:03 2012 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Sun Oct 14 15:19:03 2012 -0400

    Merge topic 'AutomocFixDuplicatedFiles_13572' into next
    
    3446cb5 Automoc: fix #13572: issue with symbolic links


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=3446cb514bd2a4fd8538fd62ee9cf674268657d6
commit 3446cb514bd2a4fd8538fd62ee9cf674268657d6
Author:     Alex Neundorf <neundorf at kde.org>
AuthorDate: Sun Oct 14 21:16:25 2012 +0200
Commit:     Alex Neundorf <neundorf at kde.org>
CommitDate: Sun Oct 14 21:16:25 2012 +0200

    Automoc: fix #13572: issue with symbolic links
    
    Now automoc always uses GetRealPath() so symbolic links are always
    resolved and it doesn't end up with twice the same file, once with the real
    path and once with the symlinked path in some setups where the source dir
    can be accessed directly and via a symlink
    
    Alex

diff --git a/Source/cmQtAutomoc.cxx b/Source/cmQtAutomoc.cxx
index 68f1046..942c7ab 100644
--- a/Source/cmQtAutomoc.cxx
+++ b/Source/cmQtAutomoc.cxx
@@ -170,7 +170,8 @@ void cmQtAutomoc::SetupAutomocTarget(cmTarget* target)
       ++fileIt)
     {
     cmSourceFile* sf = *fileIt;
-    std::string absFile = sf->GetFullPath();
+    std::string absFile = cmsys::SystemTools::GetRealPath(
+                                                    sf->GetFullPath().c_str());
     bool skip = cmSystemTools::IsOn(sf->GetPropertyForUser("SKIP_AUTOMOC"));
     bool generated = cmSystemTools::IsOn(sf->GetPropertyForUser("GENERATED"));
 

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

Summary of changes:
 Source/cmQtAutomoc.cxx |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)


hooks/post-receive
-- 
CMake