[Cmake-commits] CMake branch, next, updated. v2.8.11.2-4395-g81b1ac8

[Stephen Kelly]

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  81b1ac829ecd4352137d32092c0bf66ace891b05 (commit)
       via  20c882b0c8031246fa6280a32b7c6fa121ae664f (commit)
      from  200a16fef961750ccd72d96b5df0bf172981508b (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=81b1ac829ecd4352137d32092c0bf66ace891b05
commit 81b1ac829ecd4352137d32092c0bf66ace891b05
Merge: 200a16f 20c882b
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Tue Oct 1 09:33:33 2013 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Oct 1 09:33:33 2013 -0400

    Merge topic 'FindQt4-clear-variable' into next
    
    20c882b Revert "FindQt4: Clear the QT_QMAKE_EXECUTABLE variable if Qt4 is not found."


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=20c882b0c8031246fa6280a32b7c6fa121ae664f
commit 20c882b0c8031246fa6280a32b7c6fa121ae664f
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Tue Oct 1 15:33:04 2013 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Tue Oct 1 15:33:04 2013 +0200

    Revert "FindQt4: Clear the QT_QMAKE_EXECUTABLE variable if Qt4 is not found."
    
    This reverts commit acbb5a3a5b5366e791aa561eb77366869ab3a1c4.

diff --git a/Modules/FindQt4.cmake b/Modules/FindQt4.cmake
index ad1d5e5..1d17ba3 100644
--- a/Modules/FindQt4.cmake
+++ b/Modules/FindQt4.cmake
@@ -525,9 +525,6 @@ endfunction()
 function(_QT4_FIND_QMAKE QMAKE_NAMES QMAKE_RESULT VERSION_RESULT)
   list(LENGTH QMAKE_NAMES QMAKE_NAMES_LEN)
   if(${QMAKE_NAMES_LEN} EQUAL 0)
-    if (NOT QT_QMAKE_EXECUTABLE OR NOT "${major}" EQUAL 4)
-      set(QT_QMAKE_EXECUTABLE QT_QMAKE_EXECUTABLE-NOTFOUND CACHE FILEPATH "" FORCE)
-    endif()
     return()
   endif()
   list(GET QMAKE_NAMES 0 QMAKE_NAME)

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

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


hooks/post-receive
-- 
CMake