[Cmake-commits] CMake branch, next, updated. v2.8.12.1-6085-gedb2bfc

[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  edb2bfce914b4cdacda4474f2b01a8ef146dc8aa (commit)
       via  05c518b3dee430b56a090e34b55c3f8dbfd034d4 (commit)
      from  282b19d8738c7591f727a4f3d24320c0c3a83c1b (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=edb2bfce914b4cdacda4474f2b01a8ef146dc8aa
commit edb2bfce914b4cdacda4474f2b01a8ef146dc8aa
Merge: 282b19d 05c518b
Author:     Clinton Stimpson <clinton at elemtech.com>
AuthorDate: Fri Dec 6 10:08:44 2013 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Dec 6 10:08:44 2013 -0500

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


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=05c518b3dee430b56a090e34b55c3f8dbfd034d4
commit 05c518b3dee430b56a090e34b55c3f8dbfd034d4
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: Fri Dec 6 08:07:38 2013 -0700

    FindQt4: Restore ability to handle a changed QT_QMAKE_EXECUTABLE properly.
    
    This fixes a regression in commit 21123416 where it was trying to better handle
    a qmake from Qt5.

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:


hooks/post-receive
-- 
CMake