[Cmake-commits] CMake branch, next, updated. v2.8.12.1-6076-g38dc376

[Clinton Stimpson]

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  38dc376b5ae0f550979912398782cd0e75ff976e (commit)
       via  4ee3b6558b0cd1c1029848f40818dc14eb874448 (commit)
      from  4bcf2d1dbf7e1e99e4a6dd265d834996a11e9343 (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=38dc376b5ae0f550979912398782cd0e75ff976e
commit 38dc376b5ae0f550979912398782cd0e75ff976e
Merge: 4bcf2d1 4ee3b65
Author:     Clinton Stimpson <clinton at elemtech.com>
AuthorDate: Thu Dec 5 18:06:36 2013 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Dec 5 18:06:36 2013 -0500

    Merge topic 'qt4-qmake-exe' into next
    
    4ee3b65 FindQt4: Restore ability to handle a changed QT_QMAKE_EXECUTABLE properly.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=4ee3b6558b0cd1c1029848f40818dc14eb874448
commit 4ee3b6558b0cd1c1029848f40818dc14eb874448
Author:     Simon Sasburg <simon.sasburg at gmail.com>
AuthorDate: Thu Dec 5 22:21:03 2013 +0000
Commit:     Clinton Stimpson <clinton at elemtech.com>
CommitDate: Thu Dec 5 15:39:41 2013 -0700

    FindQt4: Restore ability to handle a changed QT_QMAKE_EXECUTABLE properly.

diff --git a/Modules/FindQt4.cmake b/Modules/FindQt4.cmake
index 46a0355..24747f7 100644
--- a/Modules/FindQt4.cmake
+++ b/Modules/FindQt4.cmake
@@ -738,6 +738,11 @@ _qt4_find_qmake("${_QT4_QMAKE_NAMES}" QT_QMAKE_EXECUTABLE QTVERSION)
 
 if (QT_QMAKE_EXECUTABLE AND QTVERSION)
 
+  if (QT_QMAKE_EXECUTABLE_LAST)
+    string(COMPARE NOTEQUAL "${QT_QMAKE_EXECUTABLE_LAST}" "${QT_QMAKE_EXECUTABLE}" QT_QMAKE_CHANGED)
+  endif()
+  set(QT_QMAKE_EXECUTABLE_LAST "${QT_QMAKE_EXECUTABLE}" CACHE INTERNAL "" FORCE)
+
   _qt4_get_version_components("${QTVERSION}" QT_VERSION_MAJOR QT_VERSION_MINOR QT_VERSION_PATCH)
 
   # ask qmake for the mkspecs directory

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

Summary of changes:
 Modules/FindQt4.cmake |    5 +++++
 1 files changed, 5 insertions(+), 0 deletions(-)


hooks/post-receive
-- 
CMake