[Cmake-commits] CMake branch, next, updated. v2.8.11.2-4381-gec3a361

[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  ec3a3610ecf97dd539f695b97cf7483d6ff4f208 (commit)
       via  acbb5a3a5b5366e791aa561eb77366869ab3a1c4 (commit)
       via  6a3958b374463067d279ea1e5efe14b1d2f7f967 (commit)
       via  6f74212360a2decdc19a038f2b8bec50cc58f8fd (commit)
       via  1bf010ae98312451274f5774c90bae4e1f290dfd (commit)
      from  cd5d958fcfd904bc33a4673009fd066f92c457ee (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=ec3a3610ecf97dd539f695b97cf7483d6ff4f208
commit ec3a3610ecf97dd539f695b97cf7483d6ff4f208
Merge: cd5d958 acbb5a3
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Mon Sep 30 18:03:40 2013 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Sep 30 18:03:40 2013 -0400

    Merge topic 'FindQt4-clear-variable' into next
    
    acbb5a3 FindQt4: Clear the QT_QMAKE_EXECUTABLE variable if Qt4 is not found.
    6a3958b CMake Nightly Date Stamp
    6f74212 CMake Nightly Date Stamp
    1bf010a CMake Nightly Date Stamp


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=acbb5a3a5b5366e791aa561eb77366869ab3a1c4
commit acbb5a3a5b5366e791aa561eb77366869ab3a1c4
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Tue Oct 1 00:01:57 2013 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Tue Oct 1 00:01:57 2013 +0200

    FindQt4: Clear the QT_QMAKE_EXECUTABLE variable if Qt4 is not found.
    
    If Qt 5 is found, it will be populated, and will result in later
    errors.

diff --git a/Modules/FindQt4.cmake b/Modules/FindQt4.cmake
index 1d17ba3..ad1d5e5 100644
--- a/Modules/FindQt4.cmake
+++ b/Modules/FindQt4.cmake
@@ -525,6 +525,9 @@ 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 +++
 Source/CMakeVersion.cmake |    2 +-
 2 files changed, 4 insertions(+), 1 deletions(-)


hooks/post-receive
-- 
CMake