diff --git a/CMakeLists.txt b/CMakeLists.txt index b306170c..178adff9 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -9,6 +9,10 @@ SET(POLYVOX_VERSION "${POLYVOX_VERSION_MAJOR}.${POLYVOX_VERSION_MINOR}.${POLYVOX FIND_PACKAGE(Doxygen) +# Qt is required for building the tests and optionally for bundling the documentation +FIND_PACKAGE(Qt4 COMPONENTS QtCore QtTest REQUIRED) +INCLUDE(${QT_USE_FILE}) + IF(WIN32) #These are used on Windows to ensure that the .exe's and .dll get placed in the ame directory, so that we can run them. #Note they are actually deprecated in favour of 'RUNTIME_OUTPUT_DIRECTORY' et al, but these replacements apparently don't diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index 37fbb17b..3ebcd11d 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -15,10 +15,6 @@ MACRO(CREATE_TEST headerfile sourcefile executablename) ENDIF(WIN32) ENDMACRO(CREATE_TEST) -# Find the QTestLib stuff -FIND_PACKAGE(Qt4 COMPONENTS QtCore QtTest REQUIRED) -INCLUDE(${QT_USE_FILE}) - IF(NOT QT_QTTEST_FOUND) MESSAGE(STATUS "QtTest not found. Either install it or disable tests by setting BUILD_TESTING to OFF") ENDIF()