[Cmake-commits] CMake branch, next, updated. v2.8.11-2041-g5b3fa04

[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  5b3fa043c8456013436defa045e57afe79c8ba4d (commit)
       via  2fea298b0cadd4b216b08f423d13a0a1e6db783e (commit)
      from  1808c2677afff9749545e12a73eaffb52da94c74 (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=5b3fa043c8456013436defa045e57afe79c8ba4d
commit 5b3fa043c8456013436defa045e57afe79c8ba4d
Merge: 1808c26 2fea298
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Thu May 16 15:02:17 2013 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu May 16 15:02:17 2013 -0400

    Merge topic 'fix-build-without-qt4-with-qt5' into next
    
    2fea298 Revert "Make sure we always find the FindQt4.cmake shipped with CMake itself."


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=2fea298b0cadd4b216b08f423d13a0a1e6db783e
commit 2fea298b0cadd4b216b08f423d13a0a1e6db783e
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Thu May 16 21:01:47 2013 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Thu May 16 21:01:47 2013 +0200

    Revert "Make sure we always find the FindQt4.cmake shipped with CMake itself."
    
    This reverts commit 72bd2064748428ae66599fed76ac5921d42c95df.

diff --git a/Tests/CMakeLists.txt b/Tests/CMakeLists.txt
index 7de3005..e07bb69 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 QUIET PATHS "${CMAKE_SOURCE_DIR}/Modules" NO_DEFAULT_PATH)
+    find_package(Qt4)
   endif()
 
   if(QT4_FOUND)
diff --git a/Tests/RunCMake/CMakeLists.txt b/Tests/RunCMake/CMakeLists.txt
index 6a8c901..402c8a9 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 PATHS "${CMAKE_SOURCE_DIR}/Modules" NO_DEFAULT_PATH)
+find_package(Qt4 QUIET)
 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:
 Tests/CMakeLists.txt          |    2 +-
 Tests/RunCMake/CMakeLists.txt |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
CMake