kolan
/
CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Remove QtGui dependency in Qt4Deploy test and verify QtSql existance.

This commit is contained in:
Clinton Stimpson 2012-02-29 07:55:31 -07:00
parent 52e8279648
commit ab9661c1dd
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Tests/CMakeLists.txt
View File

@ -268,7 +268,7 @@ IF(BUILD_TESTING)
# run test for DeployQt4 on supported platforms/compilers (which depends on BundleUtilities) # run test for DeployQt4 on supported platforms/compilers (which depends on BundleUtilities)
# this test also depends on the existence of the standard qtiff plugin # 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} ADD_TEST(Qt4Deploy ${CMAKE_CTEST_COMMAND}
--build-and-test --build-and-test
"${CMake_SOURCE_DIR}/Tests/Qt4Deploy" "${CMake_SOURCE_DIR}/Tests/Qt4Deploy"

2
Tests/Qt4Deploy/CMakeLists.txt
View File

@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8)
project(Qt4Deploy) project(Qt4Deploy)
set(CMAKE_INSTALL_PREFIX ${CMAKE_CURRENT_BINARY_DIR}/install) 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}) include(${QT_USE_FILE})
add_executable(testdeploy MACOSX_BUNDLE testdeploy.cpp) add_executable(testdeploy MACOSX_BUNDLE testdeploy.cpp)

2
Tests/Qt4Deploy/testdeploy.cpp
View File

@ -1,8 +1,8 @@
#include <QCoreApplication> #include <QCoreApplication>
#include <QImageReader>
#include <QSqlDatabase> #include <QSqlDatabase>
#include <QLibraryInfo> #include <QLibraryInfo>
#include <QDebug> #include <QDebug>
#include <QStringList>
int main(int argc, char** argv) int main(int argc, char** argv)
{ {