[Cmake-commits] CMake branch, next, updated. v2.8.7-2970-gb71538d

[Rolf Eike Beer]

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  b71538d30faa0d5ab0dbc4636a6f19e7e0e90f61 (commit)
       via  4689eedcc0a1cd73a95dbce583c9470319312b80 (commit)
      from  f857e77536ad50bc68050d31ab84a15c81a9c017 (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=b71538d30faa0d5ab0dbc4636a6f19e7e0e90f61
commit b71538d30faa0d5ab0dbc4636a6f19e7e0e90f61
Merge: f857e77 4689eed
Author:     Rolf Eike Beer <eike at sf-mail.de>
AuthorDate: Wed Feb 29 15:37:13 2012 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Feb 29 15:37:13 2012 -0500

    Merge topic 'qt4-deploy' into next
    
    4689eed reflect that the QtAutomoc depends on QtGui


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=4689eedcc0a1cd73a95dbce583c9470319312b80
commit 4689eedcc0a1cd73a95dbce583c9470319312b80
Author:     Rolf Eike Beer <eike at sf-mail.de>
AuthorDate: Wed Feb 29 21:35:20 2012 +0100
Commit:     Rolf Eike Beer <eike at sf-mail.de>
CommitDate: Wed Feb 29 21:35:20 2012 +0100

    reflect that the QtAutomoc depends on QtGui

diff --git a/Tests/CMakeLists.txt b/Tests/CMakeLists.txt
index 13e57d9..7e56588 100644
--- a/Tests/CMakeLists.txt
+++ b/Tests/CMakeLists.txt
@@ -888,7 +888,7 @@ ${CMake_BINARY_DIR}/bin/cmake -DVERSION=master -P ${CMake_SOURCE_DIR}/Utilities/
     )
   LIST(APPEND TEST_BUILD_DIRS "${CMake_BINARY_DIR}/Tests/Environment")
 
-  IF(QT4_WORKS)
+  IF(QT4_WORKS AND QT_QTGUI_FOUND)
     ADD_TEST(QtAutomoc ${CMAKE_CTEST_COMMAND}
       --build-and-test
       "${CMake_SOURCE_DIR}/Tests/QtAutomoc"

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

Summary of changes:
 Tests/CMakeLists.txt |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)


hooks/post-receive
-- 
CMake