Cleaner way of requesting Qt modules

This commit is contained in:
Matt Williams
2010-03-05 15:15:42 +00:00
parent 9d03360436
commit 6f70396c9a
2 changed files with 2 additions and 6 deletions

View File

@ -35,9 +35,7 @@ SET(CMAKE_DEBUG_POSTFIX "_d")
SOURCE_GROUP("Sources" FILES ${SRC_FILES}) SOURCE_GROUP("Sources" FILES ${SRC_FILES})
SOURCE_GROUP("Headers" FILES ${INC_FILES}) SOURCE_GROUP("Headers" FILES ${INC_FILES})
FIND_PACKAGE(Qt4 REQUIRED) FIND_PACKAGE(Qt4 COMPONENTS QtCore QtGui QtOpenGL REQUIRED)
SET(QT_USE_QTGUI 1)
SET(QT_USE_QTOPENGL 1)
INCLUDE(${QT_USE_FILE}) INCLUDE(${QT_USE_FILE})
FIND_PACKAGE(OpenGL REQUIRED) FIND_PACKAGE(OpenGL REQUIRED)

View File

@ -16,9 +16,7 @@ MACRO(CREATE_TEST headerfile sourcefile executablename)
ENDMACRO(CREATE_TEST) ENDMACRO(CREATE_TEST)
# Find the QTestLib stuff # Find the QTestLib stuff
FIND_PACKAGE(Qt4 REQUIRED) FIND_PACKAGE(Qt4 COMPONENTS QtCore QtTest REQUIRED)
SET(QT_USE_QTTEST TRUE)
SET(QT_DONT_USE_QTGUI TRUE)
INCLUDE(${QT_USE_FILE}) INCLUDE(${QT_USE_FILE})
INCLUDE_DIRECTORIES(${PolyVox_SOURCE_DIR}/PolyVoxCore/include ${CMAKE_CURRENT_BINARY_DIR}) INCLUDE_DIRECTORIES(${PolyVox_SOURCE_DIR}/PolyVoxCore/include ${CMAKE_CURRENT_BINARY_DIR})