[Cmake-commits] CMake branch, next, updated. v2.8.6-1791-gd300da7

Alexander Neundorf neundorf at kde.org
Thu Nov 3 17:59:16 EDT 2011


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  d300da7498f18095e587942b67f9cc33408e9722 (commit)
       via  83d02ee52b60e541d2f52feff0c0858e7e7595e8 (commit)
      from  5b3cf735a66f84ab373359f6ea3b0d93ec71eb37 (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=d300da7498f18095e587942b67f9cc33408e9722
commit d300da7498f18095e587942b67f9cc33408e9722
Merge: 5b3cf73 83d02ee
Author:     Alexander Neundorf <neundorf at kde.org>
AuthorDate: Thu Nov 3 17:59:14 2011 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Nov 3 17:59:14 2011 -0400

    Merge topic 'FixAutomocFromCCMakeFromPATH' into next
    
    83d02ee make automoc work when using ccmake via PATH (#12551)


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=83d02ee52b60e541d2f52feff0c0858e7e7595e8
commit 83d02ee52b60e541d2f52feff0c0858e7e7595e8
Author:     Alex Neundorf <neundorf at kde.org>
AuthorDate: Thu Nov 3 22:55:42 2011 +0100
Commit:     Alex Neundorf <neundorf at kde.org>
CommitDate: Thu Nov 3 22:55:42 2011 +0100

    make automoc work when using ccmake via PATH (#12551)
    
    In ccmake, cmake::GetCMakeCommand() returns "/cmake" when ccmake
    was started from the PATH, i.e. by simply running "ccmake"
    
    Alex

diff --git a/Source/cmQtAutomoc.cxx b/Source/cmQtAutomoc.cxx
index a839489..8750b64 100644
--- a/Source/cmQtAutomoc.cxx
+++ b/Source/cmQtAutomoc.cxx
@@ -67,7 +67,7 @@ void cmQtAutomoc::SetupAutomocTarget(cmTarget* target)
   targetDir += ".dir/";
 
   cmCustomCommandLine currentLine;
-  currentLine.push_back(makefile->GetCMakeInstance()->GetCMakeCommand());
+  currentLine.push_back(makefile->GetSafeDefinition("CMAKE_COMMAND"));
   currentLine.push_back("-E");
   currentLine.push_back("cmake_automoc");
   currentLine.push_back(targetDir);

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

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


hooks/post-receive
-- 
CMake


More information about the Cmake-commits mailing list