[Cmake-commits] CMake branch, next, updated. v2.8.11-2099-g8ac5709

[Brad King]

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  8ac57090f0efaca606bc62ec411426fff952ee02 (commit)
       via  444e752294166674af884c02202da518d3794fa9 (commit)
      from  de5a91f84240040f43144c07ee5d0eba58fd8c02 (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=8ac57090f0efaca606bc62ec411426fff952ee02
commit 8ac57090f0efaca606bc62ec411426fff952ee02
Merge: de5a91f 444e752
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue May 21 14:55:32 2013 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue May 21 14:55:32 2013 -0400

    Merge topic 'fix-build-without-qt4-with-qt5' into next
    
    444e752 FindQt4: Fix QUIET failure with Qt 5 but not Qt 4


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=444e752294166674af884c02202da518d3794fa9
commit 444e752294166674af884c02202da518d3794fa9
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Wed May 15 16:17:41 2013 +0200
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Tue May 21 14:52:26 2013 -0400

    FindQt4: Fix QUIET failure with Qt 5 but not Qt 4
    
    The call
    
     find_package(Qt4 QUIET)
    
    should be non-FATAL in that case. This fixes #14142.

diff --git a/Modules/FindQt4.cmake b/Modules/FindQt4.cmake
index 21e8e91..85686a9 100644
--- a/Modules/FindQt4.cmake
+++ b/Modules/FindQt4.cmake
@@ -657,8 +657,11 @@ if (QT_QMAKE_EXECUTABLE AND QTVERSION)
     message(WARNING "${QT_QMAKE_EXECUTABLE} reported QT_INSTALL_LIBS as \"${QT_LIBRARY_DIR_TMP}\" "
                     "but QtCore could not be found there.  "
                     "Qt is NOT installed correctly for the target build environment.")
+    set(Qt4_FOUND FALSE)
     if(Qt4_FIND_REQUIRED)
       message( FATAL_ERROR "Could NOT find QtCore. Check ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeError.log for more details.")
+    else()
+      return()
     endif()
   endif()
 

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

Summary of changes:


hooks/post-receive
-- 
CMake