[Cmake-commits] CMake branch, next, updated. v2.8.10.2-2979-g7cb3ce3

[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  7cb3ce38f75c1919dd6477f76cc873d5df0e48b1 (commit)
       via  72bd2064748428ae66599fed76ac5921d42c95df (commit)
       via  64e262b913f57942dc2a17a26426ef71b23e1f39 (commit)
      from  614255673a2230190d14bc87cf7d62f2ae37cfc7 (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=7cb3ce38f75c1919dd6477f76cc873d5df0e48b1
commit 7cb3ce38f75c1919dd6477f76cc873d5df0e48b1
Merge: 6142556 72bd206
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Wed May 15 11:19:48 2013 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed May 15 11:19:48 2013 -0400

    Merge topic 'fix-build-without-qt4-with-qt5' into next
    
    72bd206 Make sure we always find the FindQt4.cmake shipped with CMake itself.
    64e262b 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=72bd2064748428ae66599fed76ac5921d42c95df
commit 72bd2064748428ae66599fed76ac5921d42c95df
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Wed May 15 17:02:06 2013 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Wed May 15 17:19:10 2013 +0200

    Make sure we always find the FindQt4.cmake shipped with CMake itself.

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)

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=64e262b913f57942dc2a17a26426ef71b23e1f39
commit 64e262b913f57942dc2a17a26426ef71b23e1f39
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 17:18:30 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. 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