[Cmake-commits] CMake branch, next, updated. v2.8.7-2951-gab27378

[Clinton Stimpson]

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  ab273783b49f4d3d9b72c5c1d3f83c31638fb425 (commit)
       via  ab9661c1dd4340af5a84244c920d94bddd1c8e90 (commit)
      from  7688b6e6fb404848b815d0efb6fd9c3f365c9d06 (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=ab273783b49f4d3d9b72c5c1d3f83c31638fb425
commit ab273783b49f4d3d9b72c5c1d3f83c31638fb425
Merge: 7688b6e ab9661c
Author:     Clinton Stimpson <clinton at elemtech.com>
AuthorDate: Wed Feb 29 09:56:58 2012 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Feb 29 09:56:58 2012 -0500

    Merge topic 'qt4-deploy' into next
    
    ab9661c Remove QtGui dependency in Qt4Deploy test and verify QtSql existance.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=ab9661c1dd4340af5a84244c920d94bddd1c8e90
commit ab9661c1dd4340af5a84244c920d94bddd1c8e90
Author:     Clinton Stimpson <clinton at elemtech.com>
AuthorDate: Wed Feb 29 07:55:31 2012 -0700
Commit:     Clinton Stimpson <clinton at elemtech.com>
CommitDate: Wed Feb 29 07:55:31 2012 -0700

    Remove QtGui dependency in Qt4Deploy test and verify QtSql existance.

diff --git a/Tests/CMakeLists.txt b/Tests/CMakeLists.txt
index cc2ae5e..13e57d9 100644
--- a/Tests/CMakeLists.txt
+++ b/Tests/CMakeLists.txt
@@ -268,7 +268,7 @@ IF(BUILD_TESTING)
 
     # run test for DeployQt4 on supported platforms/compilers (which depends on BundleUtilities)
     # this test also depends on the existence of the standard qtiff plugin
-    if(QT4_WORKS)
+    if(QT4_WORKS AND QT_QTSQL_FOUND)
       ADD_TEST(Qt4Deploy ${CMAKE_CTEST_COMMAND}
         --build-and-test
         "${CMake_SOURCE_DIR}/Tests/Qt4Deploy"
diff --git a/Tests/Qt4Deploy/CMakeLists.txt b/Tests/Qt4Deploy/CMakeLists.txt
index ccacf74..646ea9f 100644
--- a/Tests/Qt4Deploy/CMakeLists.txt
+++ b/Tests/Qt4Deploy/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8)
 project(Qt4Deploy)
 set(CMAKE_INSTALL_PREFIX ${CMAKE_CURRENT_BINARY_DIR}/install)
 
-find_package(Qt4 REQUIRED QtMain QtCore QtGui QtSql)
+find_package(Qt4 REQUIRED QtMain QtCore QtSql)
 include(${QT_USE_FILE})
 
 add_executable(testdeploy MACOSX_BUNDLE testdeploy.cpp)
diff --git a/Tests/Qt4Deploy/testdeploy.cpp b/Tests/Qt4Deploy/testdeploy.cpp
index bcf77a2..8b9c8d6 100644
--- a/Tests/Qt4Deploy/testdeploy.cpp
+++ b/Tests/Qt4Deploy/testdeploy.cpp
@@ -1,8 +1,8 @@
 #include <QCoreApplication>
-#include <QImageReader>
 #include <QSqlDatabase>
 #include <QLibraryInfo>
 #include <QDebug>
+#include <QStringList>
 
 int main(int argc, char** argv)
 {

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

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


hooks/post-receive
-- 
CMake