From 6f70396c9a97780fcee3392282dddf8106f0c851 Mon Sep 17 00:00:00 2001
From: Matt Williams <matt@milliams.com>
Date: Fri, 5 Mar 2010 15:15:42 +0000
Subject: [PATCH] Cleaner way of requesting Qt modules

---
 examples/OpenGL/CMakeLists.txt | 4 +---
 tests/CMakeLists.txt           | 4 +---
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/examples/OpenGL/CMakeLists.txt b/examples/OpenGL/CMakeLists.txt
index f3c0f80e..08ff44b7 100644
--- a/examples/OpenGL/CMakeLists.txt
+++ b/examples/OpenGL/CMakeLists.txt
@@ -35,9 +35,7 @@ SET(CMAKE_DEBUG_POSTFIX "_d")
 SOURCE_GROUP("Sources" FILES ${SRC_FILES})
 SOURCE_GROUP("Headers" FILES ${INC_FILES})
 
-FIND_PACKAGE(Qt4 REQUIRED)
-SET(QT_USE_QTGUI 1)
-SET(QT_USE_QTOPENGL 1)
+FIND_PACKAGE(Qt4 COMPONENTS QtCore QtGui QtOpenGL REQUIRED)
 INCLUDE(${QT_USE_FILE})
 
 FIND_PACKAGE(OpenGL REQUIRED)
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index 1b21bb15..2420aef5 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -16,9 +16,7 @@ MACRO(CREATE_TEST headerfile sourcefile executablename)
 ENDMACRO(CREATE_TEST)
 
 # Find the QTestLib stuff
-FIND_PACKAGE(Qt4 REQUIRED)
-SET(QT_USE_QTTEST TRUE)
-SET(QT_DONT_USE_QTGUI TRUE)
+FIND_PACKAGE(Qt4 COMPONENTS QtCore QtTest REQUIRED)
 INCLUDE(${QT_USE_FILE})
 
 INCLUDE_DIRECTORIES(${PolyVox_SOURCE_DIR}/PolyVoxCore/include ${CMAKE_CURRENT_BINARY_DIR})