[Cmake-commits] CMake branch, next, updated. v2.8.10.2-2973-g925eb83

[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  925eb83c383e5734ced262c3df8ba3b31b80ff53 (commit)
       via  1a1a7aef24ee69e1630109771a895b1eef5a64a5 (commit)
      from  b11ed88a3f11d0e6d1325f44a8bfdbf67e3b83a9 (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=925eb83c383e5734ced262c3df8ba3b31b80ff53
commit 925eb83c383e5734ced262c3df8ba3b31b80ff53
Merge: b11ed88 1a1a7ae
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Wed May 15 10:41:09 2013 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed May 15 10:41:09 2013 -0400

    Merge topic 'fix-build-without-qt4-with-qt5' into next
    
    1a1a7ae Make sure we can configure CMake if Qt 4 is not available but Qt 5 is.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=1a1a7aef24ee69e1630109771a895b1eef5a64a5
commit 1a1a7aef24ee69e1630109771a895b1eef5a64a5
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Wed May 15 16:17:41 2013 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Wed May 15 16:40:10 2013 +0200

    Make sure we can configure CMake if Qt 4 is not available but Qt 5 is.
    
     find_package(Qt4 QUIET)
    
    should be non-FATAL in that case. Also, make sure we always find the
    FindQt4.cmake shipped with CMake itself.

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()
 
diff --git a/Tests/CMakeLists.txt b/Tests/CMakeLists.txt
index e07bb69..7de3005 100644
--- a/Tests/CMakeLists.txt
+++ b/Tests/CMakeLists.txt
@@ -263,7 +263,7 @@ if(BUILD_TESTING)
   list(APPEND TEST_BUILD_DIRS ${CMake_TEST_INSTALL_PREFIX})
 
   if(NOT QT4_FOUND)
-    find_package(Qt4)
+    find_package(Qt4 QUIET PATHS "${CMAKE_SOURCE_DIR}/Modules" NO_DEFAULT_PATH)
   endif()
 
   if(QT4_FOUND)
diff --git a/Tests/RunCMake/CMakeLists.txt b/Tests/RunCMake/CMakeLists.txt
index 402c8a9..6a8c901 100644
--- a/Tests/RunCMake/CMakeLists.txt
+++ b/Tests/RunCMake/CMakeLists.txt
@@ -76,7 +76,7 @@ add_RunCMake_test(include_directories)
 add_RunCMake_test(list)
 add_RunCMake_test(CMP0004)
 
-find_package(Qt4 QUIET)
+find_package(Qt4 QUIET PATHS "${CMAKE_SOURCE_DIR}/Modules" NO_DEFAULT_PATH)
 find_package(Qt5Core QUIET)
 if (QT4_FOUND AND Qt5Core_FOUND AND NOT Qt5Core_VERSION VERSION_LESS 5.1.0)
   add_RunCMake_test(IncompatibleQt)

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

Summary of changes:
 Modules/FindQt4.cmake         |    3 +++
 Tests/CMakeLists.txt          |    2 +-
 Tests/RunCMake/CMakeLists.txt |    2 +-
 3 files changed, 5 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
CMake