From 0db01213a79a5d7634a57bbfc1470d98b74e359f Mon Sep 17 00:00:00 2001 From: Matt Williams Date: Tue, 2 Mar 2010 16:08:33 +0000 Subject: [PATCH] Set Qt to be a required package --- examples/OpenGL/CMakeLists.txt | 4 ++-- tests/CMakeLists.txt | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/examples/OpenGL/CMakeLists.txt b/examples/OpenGL/CMakeLists.txt index 47a85505..ff5c3585 100644 --- a/examples/OpenGL/CMakeLists.txt +++ b/examples/OpenGL/CMakeLists.txt @@ -35,7 +35,7 @@ SET(CMAKE_DEBUG_POSTFIX "_d") SOURCE_GROUP("Sources" FILES ${SRC_FILES}) SOURCE_GROUP("Headers" FILES ${INC_FILES}) -FIND_PACKAGE(Qt4) +FIND_PACKAGE(Qt4 REQUIRED) SET(QT_USE_QTGUI 1) SET(QT_USE_QTOPENGL 1) INCLUDE(${QT_USE_FILE}) @@ -48,7 +48,7 @@ FIND_PACKAGE(OpenGL REQUIRED) #Also, glut32.dll goes in C:\Windows\System. Using C:\Windows\System32 doesn't seem to work #Tell CMake the paths for OpenGL and for PolyVox (which is just relative to our current location) -INCLUDE_DIRECTORIES(${Boost_INCLUDE_DIRS} ${OPENGL_INCLUDE_DIR} "../../library/PolyVoxCore/include") +INCLUDE_DIRECTORIES(${OPENGL_INCLUDE_DIR} "../../library/PolyVoxCore/include") #There has to be a better way! LINK_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}/../../library/PolyVoxCore/debug ${CMAKE_CURRENT_BINARY_DIR}/../../library/PolyVoxCore/release) diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index f23c9f62..8cbfa686 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -11,7 +11,7 @@ MACRO(CREATE_TEST headerfile sourcefile executablename) ENDMACRO(CREATE_TEST) # Find the QTestLib stuff -FIND_PACKAGE(Qt4) +FIND_PACKAGE(Qt4 REQUIRED) SET(QT_USE_QTTEST TRUE) SET(QT_DONT_USE_QTGUI TRUE) INCLUDE(${QT_USE_FILE})